From: Jeremy Davis Date: Fri, 26 Jun 2015 21:38:02 +0000 (-0400) Subject: Merge branch '3.x-pre' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=daa7e41eabe79e3ca7f65e060e7c588715bf236b;p=freeside.git Merge branch '3.x-pre' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH --- daa7e41eabe79e3ca7f65e060e7c588715bf236b