Merge remote-tracking branch 'remotes/origin/master'

author Richard Millet <remillet@berkeley.edu>

Wed, 11 Apr 2012 22:02:59 +0000 (15:02 -0700)

committer Richard Millet <remillet@berkeley.edu>

Wed, 11 Apr 2012 22:02:59 +0000 (15:02 -0700)
author Richard Millet <remillet@berkeley.edu>
Wed, 11 Apr 2012 22:02:59 +0000 (15:02 -0700)
committer Richard Millet <remillet@berkeley.edu>
Wed, 11 Apr 2012 22:02:59 +0000 (15:02 -0700)
diff --cc services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java
Simple merge
author	Richard Millet <remillet@berkeley.edu>
	Wed, 11 Apr 2012 22:02:59 +0000 (15:02 -0700)
committer	Richard Millet <remillet@berkeley.edu>
	Wed, 11 Apr 2012 22:02:59 +0000 (15:02 -0700)