From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 15 Mar 2013 14:47:37 +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=a2634ecb8ddbc2883fb9304b2effccc76e3b5881;p=ipfire-3.x.git

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

a2634ecb8ddbc2883fb9304b2effccc76e3b5881