Merge branch 'upstream'
[routino] / web / www / routino / router.html.nl
2010-12-15 Thibaut GRIDELImported Upstream version 1.5