Merge branch 'hot-readme' into develop

This commit is contained in:
Stefan Brand 2012-02-23 08:45:41 +01:00
commit d27991cbd1