From: Mark Wells <mark@freeside.biz>
Date: Sat, 14 May 2016 16:40:07 +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=5f26e344a894a65dfa7ccff7d3063e2f20eb0eff

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

5f26e344a894a65dfa7ccff7d3063e2f20eb0eff