From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 19 Apr 2013 20:54:03 +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=29040dc99217d630e87236fe7e25dd97ad8b9990;p=freeside.git

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

29040dc99217d630e87236fe7e25dd97ad8b9990