Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 17:25:13 +0000 (13:25 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 17:25:13 +0000 (13:25 -0400)
commitbc24bb87b359242ab1ffa5097b4b379ae0e5682e
tree2b2c36f945af73744b5936032504fabe3dfa5a94
parentdd76a94b9716003725c0bfe73c34d6e4e6cd0e0f
parentaa155d652e018084f5bc5369df86e46c3ea822a7
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin