From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 17 Jan 2015 02:37:43 +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=b7cf1606a66cca95e3540f803ffa66d223f23a40;hp=--cc

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

b7cf1606a66cca95e3540f803ffa66d223f23a40