From: Alex Brelsfoard Date: Thu, 29 Jan 2015 17:40:45 +0000 (-0500) Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=9832a60d3fc60a1c8d7315f0404c4dadd3bd3794;p=freeside.git Merge branch 'master' of git.freeside.biz:/home/git/freeside --- 9832a60d3fc60a1c8d7315f0404c4dadd3bd3794