From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 27 Dec 2012 23:49:15 +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=4776125b98c8ed617a4eb7491739a2290a2d5268;p=people%2Famarx%2Fipfire-3.x.git

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

4776125b98c8ed617a4eb7491739a2290a2d5268