Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Tue, 2 Oct 2012 13:15:01 +0000 (09:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Tue, 2 Oct 2012 13:15:01 +0000 (09:15 -0400)

Trivial merge