Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 19 Dec 2012 20:15:06 +0000 (15:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 19 Dec 2012 20:15:06 +0000 (15:15 -0500)
commit4b0b4e6c0fe76a05383a529dab900c5c0a540f42
tree1834097ad5067b10adc3ce4c196470f1865d4d79
parentf4ff6db7d3b2730a1cf4e48a9c9cdd6cfb207b96
parent00e0a3994163a898b9f83f3126185c10a94495f5
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen