From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 27 Apr 2015 09:59:21 +0000 (-0700)
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=ad3bcb39580173f0ac1b6357cb49515d48af7ddf

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

ad3bcb39580173f0ac1b6357cb49515d48af7ddf