From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 4 Jan 2015 02:35:01 +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=859036a7e64506106a507f12e7196efeb40733a1

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

859036a7e64506106a507f12e7196efeb40733a1