Merge branch 'master' of git.evergreen-ils.org:NCIPServer into better_abstraction
authorJason Stephenson <jason@sigio.com>
Wed, 6 Aug 2014 23:07:40 +0000 (19:07 -0400)
committerJason Stephenson <jason@sigio.com>
Wed, 6 Aug 2014 23:07:40 +0000 (19:07 -0400)

Trivial merge