From: Jeremy Davis Date: Sat, 29 Nov 2014 21:11:48 +0000 (-0500) Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=b35987f47a04e2875949ac95dcbb19ff49026e33 Merge branch 'master' of git.freeside.biz:/home/git/freeside --- b35987f47a04e2875949ac95dcbb19ff49026e33