From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 16 Feb 2012 11:31:28 +0000 (-0800)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=6fc6a5d6b830bc72c930c2c9bf1bdc6cfcefcead;p=tmp%2Fjakarta-migration.git

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

Conflicts:
	README.txt
---

6fc6a5d6b830bc72c930c2c9bf1bdc6cfcefcead
diff --cc README.txt
index 1edb92244,d5518f541..9e3d9bb10
--- a/README.txt
+++ b/README.txt
@@@ -20,4 -20,12 +20,14 @@@ 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 4
+ Make 5
+ Make 6 - Edited on github
+ 
+ Make 7
+ Make 8