From: Jason Stephenson Date: Fri, 23 Sep 2011 15:20:35 +0000 (-0400) Subject: Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp851871 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fcollab%2Fdyrcona%2Flp851871;p=working%2FEvergreen.git Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp851871 --- c63ddec60a303dbecabb1596c716f0894dea0ac3