From: Mark Wells <mark@freeside.biz>
Date: Fri, 7 Aug 2015 05:00:10 +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=6fa9fee704a6289a6a23d836bd7f9c5796325d83;hp=-c

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

6fa9fee704a6289a6a23d836bd7f9c5796325d83