From: Maniacikarus <maniacikarus@ipfire.org>
Date: Sat, 16 Aug 2008 18:26:53 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.3-beta3~29
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=72fd3d45e23bfa809f7d5f41e5327b46e65f5254

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
---

72fd3d45e23bfa809f7d5f41e5327b46e65f5254
diff --cc html/cgi-bin/wlanap.cgi
index aca9e358ec,1e5da201e4..aca9e358ec
mode 100755,100644..100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi