Merge branch 'master' of github.com:shazow/ssh-chat origin/v0
authorAndrey Petrov <andrey.petrov@shazow.net>
Sat, 10 Jan 2015 20:52:04 +0000 (12:52 -0800)
committerAndrey Petrov <andrey.petrov@shazow.net>
Sat, 10 Jan 2015 20:52:04 +0000 (12:52 -0800)

Trivial merge