From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 23 Apr 2014 07:14:10 +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=7ff73ebf72cb30c9e9b8135038c30832d8f9188b

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

7ff73ebf72cb30c9e9b8135038c30832d8f9188b