Merge branch 'ossi96-dhm'
authorSergey M․ <dstftw@gmail.com>
Sat, 28 Mar 2015 16:30:27 +0000 (22:30 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 28 Mar 2015 16:30:27 +0000 (22:30 +0600)

Trivial merge