Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Tue, 9 Oct 2012 17:15:06 +0000 (13:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Tue, 9 Oct 2012 17:15:06 +0000 (13:15 -0400)
commitb91beee736ed6143709691a16eb763abe628c932
treedac856abbe88445f2c425ac08275117b69c85e68
parentabfeb0e6a249a90860fa81d2f5a71a45731d2a81
parent95f607400e1adc51c8dea8c38a917ed85c7c2772
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen