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

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

88278e0a7939ed26d70ef9669a05dabf79b93777
diff --cc README.txt
index 2d7ef5e5e,1d4bcfcce..fc6113803
--- a/README.txt
+++ b/README.txt
@@@ -25,9 -25,7 +25,9 @@@ Make 
  Make 3
  Make 4
  Make 5
- Make 6
+ Make 6 - Edited on github
  
  Make 7
 +
  Make 8
- Make 9 in detached head again.
++Make 9 in detached head again.