From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 16 Jul 2014 13:19:30 +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=7943c96636596806b9fc99195c23b166728280c8

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

7943c96636596806b9fc99195c23b166728280c8