From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 21 Oct 2010 23:14:14 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa527c3a549acaf820a534bbb234a570c4891673;p=ipfire-3.x.git

Merge branch 'next'
---

fa527c3a549acaf820a534bbb234a570c4891673