From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 Jun 2012 22:55:06 +0000 (+0000)
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=c7edeb0f4d221247569bbc64b855925525463a86;p=ipfire-3.x.git

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

c7edeb0f4d221247569bbc64b855925525463a86