From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 2 Jul 2013 18:57:03 +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=3564f619654c5cbf22fc2acbe7eff0c08308e859

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

3564f619654c5cbf22fc2acbe7eff0c08308e859