Merge branch 'hakatashi-niconico-channel-video'
authorSergey M․ <dstftw@gmail.com>
Fri, 4 Jul 2014 15:06:31 +0000 (22:06 +0700)
committerSergey M․ <dstftw@gmail.com>
Fri, 4 Jul 2014 15:06:31 +0000 (22:06 +0700)

Trivial merge