Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Thu, 29 Nov 2012 19:15:02 +0000 (14:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Thu, 29 Nov 2012 19:15:02 +0000 (14:15 -0500)
commit0e48d286edd23bdda373ceea704ddf48f34300da
treec51b1b22483c0a511d51a879aad83a9b44f2bcea
parent2799d6dbb06afd544a798e3b13358b8c3014037d
parent2c98231113f6ce9bf86534c490e54c0c1b31e119
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen