Permalink
Browse files

Merge remote-tracking branch 'git-svn'

Keep updated pom.xml, but add MPL.

Conflicts:
	pom.xml
  • Loading branch information...
2 parents 636003b + 3432e1b commit 269d2218a91b3161be07e0a3e55012c3e3aead49 @sj26 committed Jun 27, 2011
Showing with 470 additions and 0 deletions.
  1. +470 −0 MPL-1.1.txt
Oops, something went wrong.

0 comments on commit 269d221

Please sign in to comment.