From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 10 Aug 2014 02:38:12 +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=d883a843dcfce64caeddd2a4abb0982c16a17199

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

d883a843dcfce64caeddd2a4abb0982c16a17199