Merge remote branch 'origin/obi/bug_724_wpa_modes' into acid-burn/networking_changes
authoracid-burn <acid-burn@opendreambox.org>
Tue, 15 Mar 2011 12:08:16 +0000 (13:08 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 15 Mar 2011 12:08:16 +0000 (13:08 +0100)
commit057f9b4f5534a302c6e66431894724ae213985b1
tree7693b6a241d7fe56e628a2831e6f13bf62989f77
parenta8a4bf79a9686f655ff7cb49d08879ae63d432a6
parent74ef8cacc65911f9a64fef9f0fd9607dd178f64c
Merge remote branch 'origin/obi/bug_724_wpa_modes' into acid-burn/networking_changes
lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py