From: Mark Wells <mark@freeside.biz>
Date: Tue, 25 Aug 2015 00:17:18 +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=df94942698dac9ecf31b8d1eb7a0d383b247ee17

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

df94942698dac9ecf31b8d1eb7a0d383b247ee17