git.aero2k.de Git - tmp/jakarta-migration.git/commit

author	Richard Millet <remillet@berkeley.edu>
	Sat, 25 Aug 2012 00:08:16 +0000 (17:08 -0700)
committer	Richard Millet <remillet@berkeley.edu>
	Sat, 25 Aug 2012 00:08:16 +0000 (17:08 -0700)
commit	ad1e893135452d39e5541e8b97d5c5edb90fb068
tree	b8cec85ff007ef57dce630d4f8cace3e6588cffb	tree \| snapshot
parent	57fd14fa23bec3a0a014abbe13bdbff04fe1dd68	commit \| diff
parent	58aeac3e11b26baadc7251d23b9f9626c18ae891	commit \| diff

Merge branch 'v2.6'

Conflicts:
3rdparty/nuxeo/build.xml
3rdparty/nuxeo/pom.xml