From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 19 Feb 2011 11:58:30 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12b499ea2ce460c4e5304f56fd36c62abf71a13c;p=ipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
---

12b499ea2ce460c4e5304f56fd36c62abf71a13c