From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 18 Apr 2014 20:24:24 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.15-rc2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d2fe8cedd68bfdf648df1baf8b654a846f8c022;p=ipfire-2.x.git

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

8d2fe8cedd68bfdf648df1baf8b654a846f8c022