Merge branch 'master' of git://git.mvlcstaff.org/tsbere/ILS into mdp-improve
authorThomas Berezansky <tsbere@mvlc.org>
Wed, 18 May 2011 12:14:57 +0000 (08:14 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Wed, 18 May 2011 12:14:57 +0000 (08:14 -0400)
Conflicts:
Open-ILS/src/sql/Pg/make-db-patch.pl


Trivial merge