From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 27 Feb 2013 23:44:02 +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=942431fdcb3803b7ef98b1be8c4dc188e1a4b5aa

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

942431fdcb3803b7ef98b1be8c4dc188e1a4b5aa