From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 5 Jun 2012 21:04:51 +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=6717aa4bb11969de8759b7ade6087f56b2f4580f;p=ipfire-3.x.git

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

6717aa4bb11969de8759b7ade6087f56b2f4580f