From: Jonathan Prykop <jonathan@freeside.biz>
Date: Tue, 31 Mar 2015 18:56:41 +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=b7ef80d945a1d5919e6f25437cf765e6355e5cb5;hp=b7ef80d945a1d5919e6f25437cf765e6355e5cb5;p=freeside.git

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---