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

author	Aron Roberts <aron@socrates.berkeley.edu>
	Thu, 16 Feb 2012 11:31:28 +0000 (03:31 -0800)
committer	Aron Roberts <aron@socrates.berkeley.edu>
	Thu, 16 Feb 2012 11:31:28 +0000 (03:31 -0800)
commit	6fc6a5d6b830bc72c930c2c9bf1bdc6cfcefcead
tree	45f0ffeabb817c3a6b3e13002a5523cb6f344806	tree \| snapshot
parent	aa6bf9a4b33a59f424f0069ef30a0b29686f9c0b	commit \| diff
parent	e0e8be6ac375981622baff361d9513b2b34d441a	commit \| diff

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

Conflicts:
README.txt