Merge branch 'master' into status_hilite
authornhmall <mjnh@persona.ca>
Tue, 2 Jun 2015 02:13:41 +0000 (22:13 -0400)
committernhmall <mjnh@persona.ca>
Tue, 2 Jun 2015 02:13:41 +0000 (22:13 -0400)
Conflicts:
include/extern.h
win/tty/wintty.c

1  2 
include/extern.h
win/tty/wintty.c

Simple merge
Simple merge