Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Sun, 16 Dec 2012 12:15:02 +0000 (07:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Sun, 16 Dec 2012 12:15:02 +0000 (07:15 -0500)
commit92fb01f162e02611c53cbc3edd07a3567dc3577f
tree571e50b2e090c528f27c576aeb4b64057797b631
parent2b4c073d97eb817ca22ad746b4cc9bdb29c7983b
parent81dde022ae39ecff8cbe0cbf7c85c7ce8e49df0f
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen