Merge branch 'upstream'
[routino] / src / files.h
2010-12-15 Thibaut GRIDELImported Upstream version 1.5