From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 24 Jun 2012 23:05:40 +0000 (+0200)
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=b916d61d44e66d11b4fdc834fb0d10bb9195f59d;p=people%2Fms%2Fipfire-3.x.git

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

b916d61d44e66d11b4fdc834fb0d10bb9195f59d