Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 14 Dec 2012 23:15:01 +0000 (18:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 14 Dec 2012 23:15:01 +0000 (18:15 -0500)

Trivial merge