From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 20 Oct 2014 20:00:43 +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=06fd3d9f3ca53b2d2f7595e55be4b129ca69511c

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

06fd3d9f3ca53b2d2f7595e55be4b129ca69511c