From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 27 Nov 2010 14:39:30 +0000 (+0100)
Subject: Merge branch 'fireinfo'
X-Git-Tag: v2.9-beta1~48^2~4
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=7c743d54f0c48f1cea6169efe09a68e0f27f18c0

Merge branch 'fireinfo'
---

7c743d54f0c48f1cea6169efe09a68e0f27f18c0