old-git.evergreen-ils.org Git - evergreen/pines.git/commit

author	Terran McCanna <tmccanna@georgialibraries.org>
	Tue, 29 Jul 2014 19:49:06 +0000 (15:49 -0400)
committer	Terran McCanna <tmccanna@georgialibraries.org>
	Tue, 29 Jul 2014 19:49:06 +0000 (15:49 -0400)
commit	6e082e4600aea27f41b5cbea1216209ef0cdb5a3
tree	406b173d8eadd556fdec0fe64e16226918a238ad	tree
parent	6237e061d8360ec3985422f542b1d654c0b67ac9	commit \| diff
parent	99b6b1f8c2efc84b184dc2ecf8a08cb65ed19ae4	commit \| diff

Merge branch 'rel_2_5_1_kpac' of git://git.evergreen-ils.org/evergreen/pines into rel_2_5_1_kpac

Conflicts:
Open-ILS/examples/kpac.xml