From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 31 Oct 2011 22:54:34 +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=a529ab92ff5d35fdfe4119f3bbb80ca423af114e;p=ipfire-3.x.git

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

a529ab92ff5d35fdfe4119f3bbb80ca423af114e