From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 23 Jun 2012 10:22:28 +0000 (+0200)
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=b2a949143087fb84a6161283ad16e905bf91d55d;p=ipfire-3.x.git

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

b2a949143087fb84a6161283ad16e905bf91d55d