From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 3 Feb 2013 20:27:46 +0000 (-0800)
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=855e05d13c8fb11862a6961ceccf426939ebe5cc

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

855e05d13c8fb11862a6961ceccf426939ebe5cc