Merge branch 'Teaman-ND' into Teaman-ND-SDHCTeaman-ND-1.28.0021-SDHC
commit4384daf2d17d714b7a48d3b6de7269727a7102c3
authorAugusto Bott <augusto@bott.com.br>
Sat, 11 Feb 2012 06:40:53 +0000 (11 04:40 -0200)
committerAugusto Bott <augusto@bott.com.br>
Sat, 11 Feb 2012 06:40:53 +0000 (11 04:40 -0200)
treee676d6746c9cdd2ffbc18097f39ef2625ad85608
parentb52c323cfa8475774a52977595c4f6983fc6a672
parentd367ad356f21b1bd5c36ee0d6e91f296b4cdbdff
Merge branch 'Teaman-ND' into Teaman-ND-SDHC

* Teaman-ND:
  IP Traffic: when/if set to 'disabled', we 'really' mean it
  MultiSSID: fix saving settings for non-WPAx VIFs (open/WEP)