Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorBill Erickson <berick@esilibrary.com>
Thu, 16 Jun 2011 15:25:46 +0000 (11:25 -0400)
committerBill Erickson <berick@esilibrary.com>
Thu, 16 Jun 2011 15:25:46 +0000 (11:25 -0400)
commit6f66fbe592a7a2bed7037f086a5cf1fb63dbac0e
tree1090dfdb94892cf5d57eeff3b32b4a66ebdae218
parentb02a9933965591920ee26a61100a5730b70190de
parent0870039fa2f6bf1e3b72a098254a7187e129fc1c
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin