From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 30 Apr 2014 04:02:15 +0000 (-0700)
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=2f83aa0920cd03724adf25b7ffb89890d43d96ce

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

2f83aa0920cd03724adf25b7ffb89890d43d96ce