Merge branch 'upstream'
[routino] / agpl-3.0.txt
2010-11-01 Thibaut GRIDELImported Upstream version 1.4.1