From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 15 May 2015 21:46:13 +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=ac0ecc2daa4e132d6a1fb3fb759cb757d376f84e;p=freeside.git

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

ac0ecc2daa4e132d6a1fb3fb759cb757d376f84e