From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 16 Feb 2012 22:44:14 +0000 (-0800)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=86110f705df5995066e101670c1c2c9358789789;p=tmp%2Fjakarta-migration.git

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

Conflicts:
	README.txt
---

86110f705df5995066e101670c1c2c9358789789
diff --cc README.txt
index a0eb3aeff,1241c2870..8a36256fc
--- a/README.txt
+++ b/README.txt
@@@ -13,4 -13,4 +13,5 @@@ Trainin
  GitHub Enterprise
  Site Status
  
 -The quick brown fox jumped over the lazy dog.
++The quick brown fox jumped over the lazy dog.
 +Another change using SmartGit client.