Merge branch 'VLAN-MultiSSID' into Teaman-NDTeaman-ND-1.28.0020
commit622532102b0972fd532715acf84936dc8ffbbcef
authorAugusto Bott <augusto@bott.com.br>
Thu, 26 Jan 2012 09:19:49 +0000 (26 07:19 -0200)
committerAugusto Bott <augusto@bott.com.br>
Thu, 26 Jan 2012 09:19:49 +0000 (26 07:19 -0200)
tree09a9020bbc7c202747834d9e44879a48c24df546
parent30116e1c3a9e70c9e10306668b96e4545f240b38
parent70b554f5e676abac605c48d99afa5b9961786707
Merge branch 'VLAN-MultiSSID' into Teaman-ND

* VLAN-MultiSSID:
  dnsmasq: fix DNS/hostname resolution on LAN bridges with DHCP disabled
release/src/router/rc/services.c