Merge remote-tracking branch 'stevee/wlan-client' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 6 Jul 2013 09:50:01 +0000 (11:50 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 6 Jul 2013 11:43:51 +0000 (13:43 +0200)
commit57097305a610383d013c87ef32ae117c18846e46
tree950cd9a5d16c0e02fef847a56ec730fd5db3a913
parentb63dc827f21fa617246ec0aa1d8a690f46b4f58e
parent71ea0d688d77705e53dae8931b1c3e2b477ed8fa
Merge remote-tracking branch 'stevee/wlan-client' into next

Conflicts:
config/cfgroot/general-functions.pl
config/cfgroot/general-functions.pl
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts