From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Mar 2014 13:41:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'pebosi/master' into bootstrap3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c69c2cafbe27d4e935856801bf4a5a0ce917d011;p=ipfire.org.git

Merge remote-tracking branch 'pebosi/master' into bootstrap3
---

c69c2cafbe27d4e935856801bf4a5a0ce917d011