Merge branch 'master' of github.com:odrling/Aegisub

src/ass_karaoke.cpp

src/ass_karaoke.h

src/audio_timing.h

src/audio_timing_karaoke.cpp

src/command/time.cpp

src/libresrc/default_hotkey.json