From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 9 Oct 2012 19:32:39 +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=98460903530ead429f608ba6fce4eac1a8ee3cf3

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

98460903530ead429f608ba6fce4eac1a8ee3cf3