Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Mon, 26 Nov 2012 17:15:01 +0000 (12:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Mon, 26 Nov 2012 17:15:01 +0000 (12:15 -0500)
commitc9d2336001660026421ac688a68ad01d6927ea61
treec430831e9c675a973084c5dba282165a5d5fc963
parentf0e8797e9eb11fc4605a7c5617e85240c068eaaa
parent968e6f8b6057fd619f65dda3dd680effb9c2eaac
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen