Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 22 Aug 2012 14:15:06 +0000 (10:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 22 Aug 2012 14:15:06 +0000 (10:15 -0400)
commitc3ed3b8fe1cd1b0ef1a6387e1c844ae0ab2fd575
tree7ab002cb499bb79c312ebebfc81c67dc2ca6a47e
parent24b4e708f97ab86cae424dfa6d6d8f6a4bafc775
parent4c9acf5776026b132387d334742badbba76ec62a
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen