Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Thu, 29 Nov 2012 22:15:01 +0000 (17:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Thu, 29 Nov 2012 22:15:01 +0000 (17:15 -0500)

Trivial merge