From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 26 Jul 2015 22:41:26 +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=9aee669886202be7035e6c6049fc71bc99dd3013

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

9aee669886202be7035e6c6049fc71bc99dd3013