From: Jeremy Davis <jeremyd@freeside.biz>
Date: Fri, 5 Dec 2014 14:50:06 +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=b962b3fbfd38f932061329e2872007b3854e8d35

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

b962b3fbfd38f932061329e2872007b3854e8d35