From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 14 Jan 2015 04:10:05 +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=ab47ba58c84178ee08d732cdd1634a18bd668398

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

ab47ba58c84178ee08d732cdd1634a18bd668398