From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 8 Sep 2012 09:05:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/thirteen' into thirteen
X-Git-Tag: v2.13-beta1~177
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=90431550c662d6e8888ea7050fdc957dea326272

Merge remote-tracking branch 'origin/thirteen' into thirteen
---

90431550c662d6e8888ea7050fdc957dea326272