From: Richard Millet <remillet@berkeley.edu>
Date: Fri, 2 Mar 2012 00:39:34 +0000 (-0800)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f817b5f75dce752a8e9ac567dcf517d59fdb186b;p=tmp%2Fjakarta-migration.git

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

f817b5f75dce752a8e9ac567dcf517d59fdb186b
diff --cc README.txt
index ef49f8bb1,9e3d9bb10..d53c0a220
--- a/README.txt
+++ b/README.txt
@@@ -20,9 -20,11 +20,11 @@@ All good boys deserve fudge
  
  All SSH keys deserve better.
  
+ All SSH keys deserve fudge.
+ =======
  Make 1 - Edited on github
  Make 2
 -Make 3
 +Make 3 - Edited locally
  Make 4
  Make 5
  Make 6 - Edited on github