From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 5 Sep 2014 18:45:48 +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=656a9b83e02e5eb5aea314b23546b156631ac51a

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

656a9b83e02e5eb5aea314b23546b156631ac51a