1.1.1dev: merge TracGuide from 1.0-stable
Authored by: cboos 2013-02-02
Parent: [r11650]
Child: [r11652]