Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorMike Rylander <mrylander@gmail.com>
Fri, 20 May 2011 14:43:33 +0000 (10:43 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 20 May 2011 14:43:33 +0000 (10:43 -0400)
commit30fa2d1b4a5898fe239e34b397d6437fbfdff0ba
treecfd9c4c6a19b8b600965a61c5ea4a80bec643a84
parentc3f8b4476d36065f2fe3cde899381ccbdb519c57
parentea20f3920b2ef71e12ef40afdeb40a6f5f361186
Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin