Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 19:09:10 +0000 (15:09 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 19:09:10 +0000 (15:09 -0400)
commitccc6f07b3541b7eb1de76ff0d9ec529e0e9d679d
tree7ffac5a6dc0578ca144b47670b202e0ad9bf5657
parent5116f5f2163af8fe89ba7693eca9b453aa3b0ce3
parenta66e257f791c550a00f3b927c2d34abf34a920e7
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin