Merge branch 'ping-soompi'
authorSergey M․ <dstftw@gmail.com>
Sat, 30 May 2015 08:37:18 +0000 (14:37 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 30 May 2015 08:37:18 +0000 (14:37 +0600)

Trivial merge