Merge branch 'misterhat-pinkbike'
authorSergey M․ <dstftw@gmail.com>
Fri, 19 Jun 2015 18:10:27 +0000 (00:10 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 19 Jun 2015 18:10:27 +0000 (00:10 +0600)

Trivial merge