From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 6 Sep 2013 04:05:11 +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=cf14219879b437bd63e15b77b96f55103a645531

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

cf14219879b437bd63e15b77b96f55103a645531