Merge branch 'master' of github.com:kelvan/gotoVienna
authorFlorian Schweikert <kelvan@logic.at>
Wed, 14 Mar 2012 17:25:23 +0000 (18:25 +0100)
committerFlorian Schweikert <kelvan@logic.at>
Wed, 14 Mar 2012 17:25:23 +0000 (18:25 +0100)

Trivial merge