Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Thu, 3 Jan 2013 20:15:06 +0000 (15:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Thu, 3 Jan 2013 20:15:06 +0000 (15:15 -0500)
commit6d13095295b804acb783320fea3b10bf699483f2
treea49d866444614bfb5114e992ca964b695be7d84e
parent95d70142f7816c8ae9161233b60f5c3c1e13ff9f
parentf472fc0b7c16f981f6063902e39207204f0cb7a9
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen