Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorMike Rylander <mrylander@gmail.com>
Tue, 14 Jun 2011 15:28:51 +0000 (11:28 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 14 Jun 2011 15:28:51 +0000 (11:28 -0400)
commit248d8255e14f0ebdce37cfb2d7ce72bc17265f3b
treef5cb349835db569cdc0e837d7f789cb5bd5a9261
parentccc6f07b3541b7eb1de76ff0d9ec529e0e9d679d
parentc1b1d40e661fdafd16863af098fda965807de22b
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin