From: Mark Wells <mark@freeside.biz>
Date: Thu, 5 Nov 2015 23:56:33 +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=59285fa7c07ac86914f3998f2635caf067c07506

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

59285fa7c07ac86914f3998f2635caf067c07506