Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorMike Rylander <mrylander@gmail.com>
Fri, 27 May 2011 18:45:47 +0000 (14:45 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 27 May 2011 18:45:47 +0000 (14:45 -0400)
commit2f1e2e04a1ee65cfc0fc30de1dd83a1ce8f492a4
tree1cf06d335ecc2625c2eacab00ff39cc5ed2283ce
parent56980fb9372f6b93b519bf6711adf8644498d2ff
parent81818c81a1df25ded485329195c9a40b960c05bd
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin