Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 3 Oct 2012 19:15:06 +0000 (15:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 3 Oct 2012 19:15:06 +0000 (15:15 -0400)
commitf99eda267c058537f0e7b49eb99c1bce158d8077
treea8e571db81fcd1a40369ca6de670db580c8642cb
parenta75d106a91a27ba676a1e795be48d094645e3642
parent290a8d27d7bc7dccdcc91c00ab2db7183f01800d
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen