Merge branch 'Teaman-ND' into Teaman-RT
commit4aaef3407026ae561abfb32efc17913d89dba9e8
authorAugusto Bott <augusto@bott.com.br>
Thu, 26 Jan 2012 09:22:17 +0000 (26 07:22 -0200)
committerAugusto Bott <augusto@bott.com.br>
Thu, 26 Jan 2012 09:22:17 +0000 (26 07:22 -0200)
tree14166d54e9c0c370883af03bfb6df556eacb511a
parenta6f33df25f61cc40962d0a18c58fa531f74e44e8
parent622532102b0972fd532715acf84936dc8ffbbcef
Merge branch 'Teaman-ND' into Teaman-RT

* Teaman-ND:
  dnsmasq: fix DNS/hostname resolution on LAN bridges with DHCP disabled
  Tools/System bugfix: command output was hidden inside the 'Notes' section'
release/src/router/rc/services.c