Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Tue, 13 Nov 2012 21:15:06 +0000 (16:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Tue, 13 Nov 2012 21:15:06 +0000 (16:15 -0500)
commit139434afea7dd49cfe9669e39830c591067de74d
tree8ed1850120e80da0dbf26c8a0236a652589d5e2f
parentfd0c0a8f7d656dbcb7d0c9d196a7d81850d05955
parenteabc8c689151b27f7d2d421775f19dbaa82dbe42
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen