From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Apr 2012 12:22:07 +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=a4b4a2fdf0dbbf1eff40a1423145cc1cac9b7364;p=ipfire-3.x.git

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

a4b4a2fdf0dbbf1eff40a1423145cc1cac9b7364