From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 1 Mar 2013 12:21:18 +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=9e50ef89c84cb2dfa1f41d9a9150875a772c4d08;p=ipfire-3.x.git

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

9e50ef89c84cb2dfa1f41d9a9150875a772c4d08