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

author Richard Millet <remillet@berkeley.edu>

Wed, 11 Jul 2012 17:47:45 +0000 (10:47 -0700)

committer Richard Millet <remillet@berkeley.edu>

Wed, 11 Jul 2012 17:47:45 +0000 (10:47 -0700)
author Richard Millet <remillet@berkeley.edu>
Wed, 11 Jul 2012 17:47:45 +0000 (10:47 -0700)
committer Richard Millet <remillet@berkeley.edu>
Wed, 11 Jul 2012 17:47:45 +0000 (10:47 -0700)
diff --cc services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
Simple merge
author	Richard Millet <remillet@berkeley.edu>
	Wed, 11 Jul 2012 17:47:45 +0000 (10:47 -0700)
committer	Richard Millet <remillet@berkeley.edu>
	Wed, 11 Jul 2012 17:47:45 +0000 (10:47 -0700)