From: Jonathan Prykop <jonathan@freeside.biz>
Date: Fri, 30 Jan 2015 02:38:40 +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=9ab7745327a6e244ddd25fe8178532a4161fa722

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

9ab7745327a6e244ddd25fe8178532a4161fa722