Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 9 Nov 2012 06:15:02 +0000 (01:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 9 Nov 2012 06:15:02 +0000 (01:15 -0500)
commit814bbc5d7ef5df9dd728d29042268c1ca4b47297
treee4359316aea84cec6826065ad24cb3872f8e1372
parent86d0f5adc5b874f38ee1d280d147cbb6d640b0c5
parentddb6dcb1eba9c4b4c06399b40265f5743652e19a
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen