From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 31 Dec 2014 03:20:08 +0000 (-0800)
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=46ba9270a226ef01d0c29635373aef09ae42d372

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

46ba9270a226ef01d0c29635373aef09ae42d372