Merge branch 'master' of git.evergreen-ils.org:Evergreen into sip_statcats
authorMike Rylander <mrylander@gmail.com>
Sat, 21 May 2011 13:42:45 +0000 (09:42 -0400)
committerMike Rylander <mrylander@gmail.com>
Sat, 21 May 2011 13:42:45 +0000 (09:42 -0400)
commit47b586109a1dc7cb0cbcb82878633252d3ba2849
treeb8d3d6578482de964a2c4dbbb5d932d4f4c8fb79
parentcc4418c87fcb0ef6f354a686ba6424b84491373a
parent5f132d5f98d719c38a01070cfa75c31ba6227252
Merge branch 'master' of git.evergreen-ils.org:Evergreen into sip_statcats
Open-ILS/web/opac/locale/en-US/lang.dtd