Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into working_branch
authorJoseph Lewis <joehms22@gmail.com>
Mon, 13 Jun 2011 22:55:40 +0000 (16:55 -0600)
committerJoseph Lewis <joehms22@gmail.com>
Mon, 13 Jun 2011 22:55:40 +0000 (16:55 -0600)
commitc009cb82ec4ad434f44d0ecb2f1ca3d85f3d9ffc
tree8e6b8ae521af4b16f4271f00c00bbc863a8bc168
parent12d467831bb1eb19fb558bcd4578e35ebfa898de
parent400fa7e97d6fdf99175af39f8f769024f3871bf1
Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into working_branch
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/web/opac/locale/en-US/lang.dtd