From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Wed, 2 Oct 2013 19:49:26 +0000 (+1300)
Subject: Merge branch 'master' of git+ssh://git.catalyst.net.nz/git/public/NCIPServer
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3ff32faf27cb2b5b9ec437871ca18fc384cfaa8e;p=working%2FNCIPServer.git

Merge branch 'master' of git+ssh://git.catalyst.net.nz/git/public/NCIPServer

Conflicts:
	t/NCIPServer.t
---

3ff32faf27cb2b5b9ec437871ca18fc384cfaa8e