From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 13 Dec 2016 20:40:15 +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=7e4a6981a48ce6ac8dd212799f4d7e342b7db64b;hp=-c

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

7e4a6981a48ce6ac8dd212799f4d7e342b7db64b