From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 8 Jan 2011 13:59:26 +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=fbcf3f8272c2553155346d4da05e641cec0d2107;p=ipfire-3.x.git

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

fbcf3f8272c2553155346d4da05e641cec0d2107