Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Thu, 19 Jul 2012 18:15:05 +0000 (14:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Thu, 19 Jul 2012 18:15:05 +0000 (14:15 -0400)
commitf066faf6ab9709225235bd7c92f81af691506ca2
treeb261dda5525b528e2264357abc4304253a2db10f
parent0d500a774bdd4d715380dd88dae50ada72bc4a12
parent571a82c493fa8f6ef1dbbb1ea148fce2da156869
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen