From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 21 Nov 2010 21:11:51 +0000 (+0100)
Subject: Merge remote branch 'origin/vmware'
X-Git-Tag: v0.2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=825de52c5105e4ed3db106afe8edaeb0320cdba6;p=oddments%2Ffireinfo.git

Merge remote branch 'origin/vmware'
---

825de52c5105e4ed3db106afe8edaeb0320cdba6