From: Mark Wells <mark@freeside.biz>
Date: Fri, 30 Oct 2015 18:24:47 +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=ebf0fbf1e78dda4cba6ce0aa1420233375f3a0ee

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

ebf0fbf1e78dda4cba6ce0aa1420233375f3a0ee