From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 11 Oct 2012 22:15:48 +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=671846c7bee35093d62a467236dddfe4706520b3

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

671846c7bee35093d62a467236dddfe4706520b3