Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Tue, 27 Nov 2012 14:27:02 +0000 (09:27 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Tue, 27 Nov 2012 14:27:02 +0000 (09:27 -0500)

Trivial merge