From: Richard Millet <remillet@berkeley.edu>
Date: Tue, 11 Sep 2012 23:02:49 +0000 (-0700)
Subject: Merge branch 'master' of github.com:collectionspace/services
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=03283188f8bd208974323d1c00b25f4c04ab8176;p=tmp%2Fjakarta-migration.git

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

Conflicts:
	services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
---

03283188f8bd208974323d1c00b25f4c04ab8176