Merge branch 'julianrichen-gfycat'
authorSergey M․ <dstftw@gmail.com>
Fri, 17 Apr 2015 21:51:38 +0000 (03:51 +0600)
committerSergey M․ <dstftw@gmail.com>
Fri, 17 Apr 2015 21:51:38 +0000 (03:51 +0600)

Trivial merge