Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Thu, 18 Oct 2012 22:15:02 +0000 (18:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Thu, 18 Oct 2012 22:15:02 +0000 (18:15 -0400)

Trivial merge