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)
commit9b88b904d6dc704df7e68890addfd8b31e0b3c8b
treea65f42073900d8e8c810869aa3b493deead98a0d
parent921e46459004e498cc7d073e1c81c0a2176dc550
parentbf83c01e4f232e050ec320969b9bb6c6a8c1eeb1
Merge branch 'master' of git://git.mvlcstaff.org/tsbere/ILS into mdp-improve

Conflicts:
Open-ILS/src/sql/Pg/make-db-patch.pl