From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 20 Oct 2012 10:31:55 +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=2c2da653a3d39945d8d2c244d102ccbee862053b;p=freeside.git

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

2c2da653a3d39945d8d2c244d102ccbee862053b