Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Mon, 4 Feb 2013 20:15:02 +0000 (15:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Mon, 4 Feb 2013 20:15:02 +0000 (15:15 -0500)

Trivial merge