Merge branch 'master' of git.evergreen-ils.org:Evergreen into sip_statcats
authorMike Rylander <mrylander@gmail.com>
Fri, 20 May 2011 14:43:42 +0000 (10:43 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 20 May 2011 14:43:42 +0000 (10:43 -0400)
commitcc4418c87fcb0ef6f354a686ba6424b84491373a
tree5215dd667bc8e562b37a802ab8665316c207d823
parent7549fc348a24dd67bb53e89c9ffc8202bdb039e4
parentea20f3920b2ef71e12ef40afdeb40a6f5f361186
Merge branch 'master' of git.evergreen-ils.org:Evergreen into sip_statcats
Open-ILS/web/opac/locale/en-US/lang.dtd