From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Jun 2013 09:49:18 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fipfire-3.x.git;a=commitdiff_plain;h=316f3de4a76efcf48a4e597ffe6d2896478884fc

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

316f3de4a76efcf48a4e597ffe6d2896478884fc