Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorJames Fournie <jfournie@sitka.bclibraries.ca>
Wed, 14 Sep 2011 17:32:50 +0000 (10:32 -0700)
committerJames Fournie <jfournie@sitka.bclibraries.ca>
Wed, 14 Sep 2011 17:32:50 +0000 (10:32 -0700)
commit66128519dcb64d236e830ebb96f0fbe2c1c95047
tree702c7f03185bf156dfc6b3678b538ec91fc63f92
parentc76e829da71710e5b8e0d3bccd4f52c0c67c6021
parentf44becacb7548894873b4573b8a5aad48a320dae
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen