Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Tue, 29 Jan 2013 07:15:01 +0000 (02:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Tue, 29 Jan 2013 07:15:01 +0000 (02:15 -0500)

Trivial merge