Merge branch 'master' of git://git.musicpd.org/avuton/ncmpc

diff --cc src/hscroll.h
Simple merge

diff --cc src/list_window.c
Simple merge

diff --cc src/screen_browser.c
Simple merge

diff --cc src/screen_interface.h
Simple merge

diff --cc src/screen_queue.c
Simple merge

diff --cc src/screen_song.c
Simple merge

diff --cc src/song_paint.h
Simple merge

diff --cc src/window.h
Simple merge