Merge branch 'Teaman-ND' into Teaman-ND-SDHC
commitf0243ea04690149da9c4e2d138f1aa3ba2d6690d
authorAugusto Bott <augusto@bott.com.br>
Mon, 9 Jan 2012 05:14:25 +0000 (9 03:14 -0200)
committerAugusto Bott <augusto@bott.com.br>
Mon, 9 Jan 2012 05:14:25 +0000 (9 03:14 -0200)
tree67920c380aab2a2bca84c0a99f7d8001c80dd625
parent9c546aeb9ae9ca59e5c8e12caed8f79a24dc818d
parent284850b0436ce19b7c7633b2186626746baa8c2d
Merge branch 'Teaman-ND' into Teaman-ND-SDHC

* Teaman-ND:
  cstats/rstats: allow 'grace period' at shutdown
  cstats: regular code maintenance
release/src/router/rc/services.c