From: Michael Peters <mrpeters@library.in.gov>
Date: Thu, 29 Nov 2012 19:15:02 +0000 (-0500)
Subject: Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0e48d286edd23bdda373ceea704ddf48f34300da;p=working%2FEvergreen.git

Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
---

0e48d286edd23bdda373ceea704ddf48f34300da