From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 3 Jul 2013 04:11:29 +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=3d0a1bb06b895c5be6e3f0517d355442a6b1e125

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

3d0a1bb06b895c5be6e3f0517d355442a6b1e125