Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Sat, 14 Mar 2015 22:34:30 +0000 (18:34 -0400)
committerDan Scott <dscott@laurentian.ca>
Sat, 14 Mar 2015 22:34:30 +0000 (18:34 -0400)
commitd7ab3ac8c34a789114fc0ea15b7bd5e38997e019
tree171bc955889899d098765b64b3580cf1b5605d7c
parent52c7e0cdb9f3457de23d4fd2d1160f33f1eb5576
parent76842834892c858673c0f2dab44bb3f879816ad2
Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/src/templates/opac/parts/misc_util.tt2
Open-ILS/src/templates/opac/parts/record/body.tt2