Éric Lemoine 8f57e34376 Merge branch 'master' into osm ...

Conflicts:
	notes/2.12.md

2012-01-17 09:10:27 +01:00

..

2.12.md

Merge branch 'master' into osm

2012-01-17 09:10:27 +01:00