From: Dan Pearl <dpearl@cwmars.org>
Date: Wed, 23 Sep 2015 18:25:33 +0000 (-0400)
Subject: Merge branch 'user/dpearl/hist_edit' of git://git.evergreen-ils.org/working/Evergreen... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9b3b4d55c4b53fe23d5db57444aaf2406e6a4b98;p=working%2FEvergreen.git

Merge branch 'user/dpearl/hist_edit' of git://git.evergreen-ils.org/working/Evergreen into hist_edit

Conflicts:
	Open-ILS/src/sql/Pg/upgrade/XXXX.editable_usr_circ_history.sql
	Open-ILS/src/templates/opac/myopac/circ_history.tt2
---

9b3b4d55c4b53fe23d5db57444aaf2406e6a4b98