Merge branch 'guide'
commita087cf455df7b86c3f7a12ce91403eb0f3b32000
authorCarsten Dominik <carsten.dominik@gmail.com>
Sat, 1 May 2010 05:43:01 +0000 (1 07:43 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sat, 1 May 2010 05:43:01 +0000 (1 07:43 +0200)
treef728baa1250b7e1498a81a962da52f6babd830ec
parent110b175ef904b4bb8bcdf96224771b63d6223bb7
parentc38d101fff2f362d66db29153c6aa80ba9acab75
Merge branch 'guide'