Merge github.com:kelvan/gotoVienna into experimental
authorFlorian Schweikert <kelvan@logic.at>
Tue, 10 Jan 2012 20:22:37 +0000 (21:22 +0100)
committerFlorian Schweikert <kelvan@logic.at>
Tue, 10 Jan 2012 20:22:37 +0000 (21:22 +0100)
commit16db513655f93766af3dd18054d04ca5f4248e99
tree459177024898d0973d947dad59ec14f75373f971
parenta2c400c1506c3e1f1ac5c57d63121fde75eb835d
parentc71e3da838653ad8d75bb8c2882b746fe90e3c1b
Merge github.com:kelvan/gotoVienna into experimental

Conflicts:
qml/MainPage.qml
gotovienna-qml
qml/MainPage.qml