Merge remote-tracking branch 'origin/generic'
[playground.git] / generic.txt
2011-10-10 Thierry Parmentelat creating a second branch