From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 19 Oct 2014 19:19:17 +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=706da330626bab472bf6f4e50cf3c181bfa0cf9f

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

706da330626bab472bf6f4e50cf3c181bfa0cf9f