From: Jonathan Prykop <jonathan@freeside.biz>
Date: Fri, 23 Jan 2015 19:07:31 +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=3ece1c396f23e04cd659f1085f6eeee8bdfd846f

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

3ece1c396f23e04cd659f1085f6eeee8bdfd846f