Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Mon, 24 Dec 2012 06:15:02 +0000 (01:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Mon, 24 Dec 2012 06:15:02 +0000 (01:15 -0500)
commit6378546d86df5ac99fbb423c6ee2be00340246af
treed78bd0cca81f405e806cf67982d6f996a3c400d3
parenta45e830f5190e0d7553b9983e1262223b33909d4
parent0483dc441e97873b48f8f72595cc577bc1ac9015
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen