From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Jun 2014 10:03:09 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.15-core79~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=602e26a56529ab13a041a2b3e535655a122edff4;p=ipfire-2.x.git

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

602e26a56529ab13a041a2b3e535655a122edff4