Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Fri, 1 Jul 2011 15:53:38 +0000 (11:53 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 1 Jul 2011 15:53:38 +0000 (11:53 -0400)
commit119041ca1b910d205deb57808429778a62f198a5
treed9152814b173c5a326df697fafb4b7c8000a88d9
parent3e74b1f922a11447afea47df813588be6b099be8
parent52402b4d28643ca013d83f87de6fecb8e0d81813
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/web/opac/locale/en-US/lang.dtd