Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 28 Sep 2012 06:15:01 +0000 (02:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 28 Sep 2012 06:15:01 +0000 (02:15 -0400)
commit10b312771b0ab05bbbbfee0383721938a4c0c27f
tree427a20bd6e9335475a8781dd202c8e5c4361e72d
parentb1044ba9b3bbdbceccf6d6e709076f37d3880f76
parenta7502463b28fdb67a18e3f452a9997fd6cd2489a
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen