From: Jonathan Prykop <jonathan@freeside.biz>
Date: Mon, 7 Dec 2015 23:47:59 +0000 (-0600)
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=ebeb3e934b36f6bdef358fe1b4264a9afb5a9c3b

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

ebeb3e934b36f6bdef358fe1b4264a9afb5a9c3b