From: Jonathan Prykop <jonathan@freeside.biz>
Date: Thu, 22 Jan 2015 21:52:26 +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=3a8fa4f27ef08792e3d653cee167979a411f89d1

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

3a8fa4f27ef08792e3d653cee167979a411f89d1