From: Jonathan Prykop <jonathan@freeside.biz>
Date: Thu, 29 Jan 2015 01:28:13 +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=92a327b2bc09344a7e0db93f40e34b71547bf075

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

92a327b2bc09344a7e0db93f40e34b71547bf075