From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 15 May 2015 18:41:24 +0000 (-0700)
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=7898193bb13ad215d1cc95983dbd092fbd2ba799

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

7898193bb13ad215d1cc95983dbd092fbd2ba799