Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorMike Rylander <mrylander@gmail.com>
Mon, 20 Jun 2011 15:51:59 +0000 (11:51 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 20 Jun 2011 15:51:59 +0000 (11:51 -0400)
commit8d5eb68ace39b0d59777ab2c91ffa7197d71d701
treeb2c6ee90afb03641ba7f70afc99d161cdaadc249
parent923699a00e1d0dd025e144ce136100f5f9dc43ab
parentb066d2c3b129e8d0738a061e23200d8311d251bf
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin