From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 5 Apr 2014 15:02:33 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.15-rc2~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=057b351186c81bfaea6c28de439762ed1aacde00;p=ipfire-2.x.git

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

057b351186c81bfaea6c28de439762ed1aacde00