From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 23 Sep 2012 21:57:08 +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=aa38c070977cf63365a4d26a3e4a7e5049ad70d0

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

aa38c070977cf63365a4d26a3e4a7e5049ad70d0