projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9820ba ad88656)
Merge remote-tracking branch 'origin/rel_2_3' into rel_2_3_mergery
authorDan Scott <dscott@laurentian.ca>
Tue, 4 Sep 2012 18:27:30 +0000 (14:27 -0400)
committerDan Scott <dscott@laurentian.ca>
Tue, 4 Sep 2012 18:27:30 +0000 (14:27 -0400)
Conflicts:
Open-ILS/examples/apache/eg_vhost.conf
Open-ILS/src/Makefile.am
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
Open-ILS/src/templates/opac/parts/place_hold.tt2

Signed-off-by: Dan Scott <dscott@laurentian.ca>

Trivial merge
Evergreen contribs