From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 6 Jun 2013 18:34:22 +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=9f84e0efea1f0fcfce3139519f2b75898f3255b0;p=freeside.git

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

9f84e0efea1f0fcfce3139519f2b75898f3255b0