From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 11 Dec 2014 00:18:22 +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=fa0223015fe6c03491b1d0d43524e03ac5fdb899

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

fa0223015fe6c03491b1d0d43524e03ac5fdb899