Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 26 Oct 2012 15:15:06 +0000 (11:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 26 Oct 2012 15:15:06 +0000 (11:15 -0400)
commit1c95829502fb7e3654929f34cfbcbfa012599c88
treec3f7fc289142aa095bab3df3c6f908255b067dd3
parentf8e91bda6d137eb3d065055c1fa82a0034a515d7
parent66ea9fe2da42bd55b2c1100d12ca4cd2e2615649
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen