From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 29 Jun 2012 23:05:53 +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=5c5249bcd96e2adb029ecae10107cb892d601c46;p=ipfire-3.x.git

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

5c5249bcd96e2adb029ecae10107cb892d601c46