From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 6 Aug 2014 22:36:56 +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=7c370a4579d1ed8b81dba2fb5fae9978b283b49e

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

7c370a4579d1ed8b81dba2fb5fae9978b283b49e