Merge remote-tracking branch 'remotes/origin/Teaman-BWM' into Teaman-ND
commitf01f290a4e1b20d987d9349a982935415e3ad5bd
authorAugusto Bott <augusto@bott.com.br>
Sat, 13 Aug 2011 21:45:59 +0000 (13 18:45 -0300)
committerAugusto Bott <augusto@bott.com.br>
Sat, 13 Aug 2011 21:45:59 +0000 (13 18:45 -0300)
treea7a181ad9af9b6eb8e7eb7889402d36c198e9cf8
parentb5fa7166dcd863eb847fcd8605f95168de1ae0aa
parent829bd2b1a15c97c5bae7cac1d14a9f76c295ee9d
Merge remote-tracking branch 'remotes/origin/Teaman-BWM' into Teaman-ND

* remotes/origin/Teaman-BWM:
  Fixed fields/data when adding static DHCP entry from status-devices.asp
release/src/router/www/basic-static.asp