From: Mark Wells <mark@freeside.biz>
Date: Mon, 17 Oct 2016 23:15:00 +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=068b074adcb3cd0c4d0b39d407c7bb2272a9cade;hp=-c

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

068b074adcb3cd0c4d0b39d407c7bb2272a9cade