Merge branch 'master' into master
authorparazyd <parazyd@users.noreply.github.com>
Fri, 30 Dec 2016 13:21:19 +0000 (14:21 +0100)
committerGitHub <noreply@github.com>
Fri, 30 Dec 2016 13:21:19 +0000 (14:21 +0100)
1  2 
config.mk
slstatus.c

diff --cc config.mk
Simple merge
diff --cc slstatus.c
Simple merge