From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 28 Jan 2015 10:26:52 +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=2e4fa975e054554beac71883436b143267d7aa12

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

2e4fa975e054554beac71883436b143267d7aa12