From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 Feb 2013 21:51:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9c2b4ea5bdf38660598e5671fc24fed2ad159b3;p=people%2Famarx%2Fipfire-3.x.git

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

f9c2b4ea5bdf38660598e5671fc24fed2ad159b3