From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 10 Jan 2013 00:22:41 +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=85ce878a87e2da7ed3e2f927cae7745ef3b59cc0

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

85ce878a87e2da7ed3e2f927cae7745ef3b59cc0