From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 27 Oct 2015 16:40:59 +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=060c42eac1ecf2f376fe806c08a2ac78987cf9a6;hp=-c

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

060c42eac1ecf2f376fe806c08a2ac78987cf9a6