From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 2 Feb 2015 09:34:59 +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=899cf5029429c1183024cd4bf838573a951d0ede

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

899cf5029429c1183024cd4bf838573a951d0ede