From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 22 Jul 2012 09:06:44 +0000 (+0200)
Subject: Merge commit 'bc291208bf67e81be57b0a6d27891140a650ec82'
X-Git-Url: http://git.ipfire.org/?p=ipfire-3.x.git;a=commitdiff_plain;h=e1a6656ec74bf88002f170efc32c6fc5cf340ce3

Merge commit 'bc291208bf67e81be57b0a6d27891140a650ec82'
---

e1a6656ec74bf88002f170efc32c6fc5cf340ce3