From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 5 Dec 2014 22:24:07 +0000 (-0800)
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=16e107a846556c19d837c8fd704d5e2089199597

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

16e107a846556c19d837c8fd704d5e2089199597