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

author	Richard Millet <remillet@berkeley.edu>
	Fri, 17 Feb 2012 23:51:17 +0000 (15:51 -0800)
committer	Richard Millet <remillet@berkeley.edu>
	Fri, 17 Feb 2012 23:51:17 +0000 (15:51 -0800)
commit	587cee86a0f4460239dd4223661317ca44a05179
tree	11ee4b56959985fff5d956ca5da83b0ffe7e82c0	tree \| snapshot
parent	f3202d1905dce0e28611232c336ae0faef5f9583	commit \| diff
parent	52ad96106a7f627752888c377a0e2ee3138a5dbe	commit \| diff

Merge branch 'detached-head'

Conflicts:
README.txt