Merge branch 'master' of github.com:kelvan/gotoVienna
authorThomas Perl <m@thp.io>
Wed, 14 Mar 2012 17:24:59 +0000 (18:24 +0100)
committerThomas Perl <m@thp.io>
Wed, 14 Mar 2012 17:24:59 +0000 (18:24 +0100)

Trivial merge