Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery_2
authorDan Scott <dscott@laurentian.ca>
Sun, 19 Aug 2012 03:18:33 +0000 (23:18 -0400)
committerDan Scott <dscott@laurentian.ca>
Sun, 19 Aug 2012 03:18:33 +0000 (23:18 -0400)
commit30c9a360e74d7f91dd6af58f9ec5f57202fb1902
tree9d39cc04c48d7e517ad7a9da7ab77d3556d0a644
parent7f6549acb636888475abb9ee302f08e7e9f1d430
parenta5822e48bdc361a40e436f5c58e27d7c79875f86
Merge branch 'rel_2_3' of git.evergreen-ils.org:Evergreen into rel_2_3_mergery_2

Conflicts:
Open-ILS/src/templates/opac/css/style.css.tt2
Open-ILS/src/templates/opac/parts/js.tt2

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Open-ILS/src/templates/opac/css/style.css.tt2
Open-ILS/src/templates/opac/parts/config.tt2
Open-ILS/src/templates/opac/parts/js.tt2
Open-ILS/src/templates/opac/parts/searchbar.tt2