From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 7 Apr 2014 14:49:33 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.15-rc2~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2250019f7d7f1bb48539f3d888be052bb3680e73;p=ipfire-2.x.git

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

2250019f7d7f1bb48539f3d888be052bb3680e73