From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 20 Apr 2012 09:56:11 +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=51b36cd5c7ef21e1228cb174fe33db2bd3ed6711;p=ipfire-3.x.git

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

51b36cd5c7ef21e1228cb174fe33db2bd3ed6711