Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into sticky-acq-fields...
authorKathy Lussier <klussier@masslnc.org>
Tue, 16 Jul 2013 20:02:31 +0000 (16:02 -0400)
committerKathy Lussier <klussier@masslnc.org>
Tue, 16 Jul 2013 20:02:31 +0000 (16:02 -0400)

Trivial merge