Merge remote-tracking branch 'remotes/origin/master' into CSPACE-5381

author Patrick Schmitz <pschmitz@berkeley.edu>

Tue, 24 Jul 2012 23:04:51 +0000 (16:04 -0700)

committer Patrick Schmitz <pschmitz@berkeley.edu>

Tue, 24 Jul 2012 23:04:51 +0000 (16:04 -0700)
author Patrick Schmitz <pschmitz@berkeley.edu>
Tue, 24 Jul 2012 23:04:51 +0000 (16:04 -0700)
committer Patrick Schmitz <pschmitz@berkeley.edu>
Tue, 24 Jul 2012 23:04:51 +0000 (16:04 -0700)
diff --cc services/client/src/main/java/org/collectionspace/services/client/IQueryManager.java
Simple merge
author	Patrick Schmitz <pschmitz@berkeley.edu>
	Tue, 24 Jul 2012 23:04:51 +0000 (16:04 -0700)
committer	Patrick Schmitz <pschmitz@berkeley.edu>
	Tue, 24 Jul 2012 23:04:51 +0000 (16:04 -0700)