From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 30 Jan 2015 01:59: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=f79a7ca7e5b3e484646190e15f995b9779089ff0

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

f79a7ca7e5b3e484646190e15f995b9779089ff0