From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 29 Oct 2015 17:52:23 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;ds=sidebyside;h=20729c347f88e5380b9309ad3f7dd452970b5c3a;p=freeside.git

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

20729c347f88e5380b9309ad3f7dd452970b5c3a