From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 21 Jan 2015 09:22:13 +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=296230b7b4fc12cf532f48fe9253cc94f565d5b5

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

296230b7b4fc12cf532f48fe9253cc94f565d5b5