Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 19:35:41 +0000 (15:35 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 19:35:41 +0000 (15:35 -0400)
commitd86d1b139ab30a3ea79fb20e46bd5852a1865820
treecad9a92058f2525d9edc8a9dcb96292fc91314c7
parentb4d72abacdd0afe3e14f2866d0c9e30cc5263734
parent76791e23e15e00e1055ed0f2e72369db50407479
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin