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

author	Richard Millet <remillet@berkeley.edu>
	Thu, 16 Feb 2012 22:44:14 +0000 (14:44 -0800)
committer	Richard Millet <remillet@berkeley.edu>
	Thu, 16 Feb 2012 22:44:14 +0000 (14:44 -0800)
commit	86110f705df5995066e101670c1c2c9358789789
tree	3bb2a3fee8e41cf4c0c5bdfe967c0397b047c3ea	tree \| snapshot
parent	228e3db731464f21718f7e531878b438910916fc	commit \| diff
parent	09da8af0618e99aae4646ec950ce0388cf858df4	commit \| diff

Merge branch 'master' of github.com:collectionspace/services

Conflicts:
README.txt