From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 5 Nov 2011 16:10:35 +0000 (+0100)
Subject: Merge branch 'uap' into next
X-Git-Tag: v2.9-core54~13^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c77a816561af92898dd79e01d38f188928ec889;p=ipfire-2.x.git

Merge branch 'uap' into next
---

2c77a816561af92898dd79e01d38f188928ec889