Merge remote-tracking branch 'upstream/master' into CSPACE-6168-REM-D

author Aron Roberts <aron@socrates.berkeley.edu>

Wed, 26 Mar 2014 02:08:05 +0000 (19:08 -0700)

committer Aron Roberts <aron@socrates.berkeley.edu>

Wed, 26 Mar 2014 02:08:05 +0000 (19:08 -0700)
author Aron Roberts <aron@socrates.berkeley.edu>
Wed, 26 Mar 2014 02:08:05 +0000 (19:08 -0700)
committer Aron Roberts <aron@socrates.berkeley.edu>
Wed, 26 Mar 2014 02:08:05 +0000 (19:08 -0700)
diff --cc services/client/src/main/java/org/collectionspace/services/client/IQueryManager.java
Simple merge
author	Aron Roberts <aron@socrates.berkeley.edu>
	Wed, 26 Mar 2014 02:08:05 +0000 (19:08 -0700)
committer	Aron Roberts <aron@socrates.berkeley.edu>
	Wed, 26 Mar 2014 02:08:05 +0000 (19:08 -0700)