Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Tue, 18 Dec 2012 05:15:06 +0000 (00:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Tue, 18 Dec 2012 05:15:06 +0000 (00:15 -0500)

Trivial merge