From: Jonathan Prykop <jonathan@freeside.biz>
Date: Mon, 13 Apr 2015 23:00:12 +0000 (-0500)
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=a179189cab28d3c1b7ae0101df5c1a95c4a72003

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

a179189cab28d3c1b7ae0101df5c1a95c4a72003