Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 20:22:33 +0000 (16:22 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 20:22:33 +0000 (16:22 -0400)
commit2563bdb5ebd55d2ef7ff6d7d3198ba27f4199529
treedc0a47396891017fbecb844cc1aa0b83e351391b
parent172f07ac26ff0e8e4337171b7883a22a7a2baad0
parent4c21518b658e7c56b819acb78b626a239a13ca24
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/web/opac/locale/en-US/lang.dtd