From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 11 Mar 2016 23:38:06 +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=ae817d8bbd220b645f41cb2d020ba8b6b739765b

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

ae817d8bbd220b645f41cb2d020ba8b6b739765b