From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 28 Aug 2012 18:21:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/thirteen' into thirteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=18245dc27978e321b26aa71af7d7238a309e3f44

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

18245dc27978e321b26aa71af7d7238a309e3f44