From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 13 Jun 2012 16:41:17 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into glibc-update
X-Git-Tag: v2.13-beta1~328^2~10^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c8031e54e0be4e2575c73d01da725849b62efc1;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into glibc-update
---

7c8031e54e0be4e2575c73d01da725849b62efc1