From: Mark Wells <mark@freeside.biz>
Date: Fri, 10 Jul 2015 23:38:28 +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=0ed195595b5c7ea404c8848d9d1881ada4214489

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

0ed195595b5c7ea404c8848d9d1881ada4214489