Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorMike Rylander <mrylander@gmail.com>
Thu, 9 Jun 2011 18:06:57 +0000 (14:06 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 9 Jun 2011 18:06:57 +0000 (14:06 -0400)
commit76ddab318f5272ec15621558df38f17a290e8e3f
tree8618bb61025ade5601b02aac288d117700b6bcc6
parenteeb7bceff0c252aed10c17448cd4ff96a6e35b34
parent000ddbbe2f16c4e7ae0242f0032bc3c4f0cbfe14
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin