From: Jonathan Prykop <jonathan@freeside.biz>
Date: Mon, 16 Feb 2015 19:53:36 +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=7b40e0e045368d350529d78208be0e6124f94b5a

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

7b40e0e045368d350529d78208be0e6124f94b5a