From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 4 Feb 2015 20:07:32 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=5310efb6d40b32ae08ae78553fc8721693925da7;hp=5310efb6d40b32ae08ae78553fc8721693925da7;p=freeside.git

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