Wut?
Merge branch 'master' of https://github.com/gnustomp/timetable-android