From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Jun 2013 08:45:19 +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=8819aeb6b26e35dd3bd6dcd2b3857415c8db4f98;p=ipfire-3.x.git

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

8819aeb6b26e35dd3bd6dcd2b3857415c8db4f98