Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorMike Rylander <mrylander@gmail.com>
Wed, 1 Jun 2011 15:49:23 +0000 (11:49 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 1 Jun 2011 15:49:23 +0000 (11:49 -0400)
commit8e4d7a0e5f684bbe7ae49840b9a923be7d628ca9
treee23b9f76b577f40faf7589b258e8dcb892a4a300
parent2f1e2e04a1ee65cfc0fc30de1dd83a1ce8f492a4
parent1aea64df0480c23cf895d637c1846d2974da5f97
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin