From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 8 Jun 2013 06:41:46 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=42eaf0aec334e15163848eb2bed33db9fd349efa;p=freeside.git

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

42eaf0aec334e15163848eb2bed33db9fd349efa