From: Terran McCanna Date: Tue, 29 Jul 2014 19:49:06 +0000 (-0400) Subject: Merge branch 'rel_2_5_1_kpac' of git://git.evergreen-ils.org/evergreen/pines into... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6e082e4600aea27f41b5cbea1216209ef0cdb5a3;p=evergreen%2Fpines.git 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 --- 6e082e4600aea27f41b5cbea1216209ef0cdb5a3