From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 10 Oct 2011 23:15:04 +0000 (+0200)
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=6dcdb90d9c3a6abffaa630d8135f52ef4d3aead2;p=ipfire-3.x.git

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

6dcdb90d9c3a6abffaa630d8135f52ef4d3aead2