projects / contrib / Conifer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitcd94d86890fb57bffe6af9c315e8e27ac6342fd9
tree0fff89be7a5ea161f204a50f4981e059cf9e8df0tree
parentf9820ba34252ff84d1356a4ec034eda68d188d68commit | diff
parentad886561bb09256c72a6d9ea62ed7e02c90f8f73commit | diff
Merge remote-tracking branch 'origin/rel_2_3' into rel_2_3_mergery

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>
Evergreen contribs