Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 24 Aug 2012 19:15:06 +0000 (15:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 24 Aug 2012 19:15:06 +0000 (15:15 -0400)
commit3b4d3dc8fd464a08bf04609d8c1c9ba249fab671
tree1c74f7866812a2682789916d894cdb12ac21bf4d
parentf16aa54a67a0f9bf2216091270bf4dec02a6e4be
parent4a09e0139f4bf9f1aceb43bc94a67066d1f12147
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen