From: Rick Jaffe <rjaffe@berkeley.edu>
Date: Wed, 14 Mar 2012 00:52:24 +0000 (-0700)
Subject: NOJIRA: Merging collectionspace master into my local repo, 13Mar2012
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e6cb638c746d360de3694463ce0f6c4fdae8a48c;p=tmp%2Fjakarta-migration.git

NOJIRA: Merging collectionspace master into my local repo, 13Mar2012
---

e6cb638c746d360de3694463ce0f6c4fdae8a48c
diff --cc .gitignore
index 2f7896d1d,2c6c748fa..555af5cbb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--target/
+ *tenant-bindings.merged.xml