Merge remote-tracking branch 'takuya0301/niconico'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 24 Nov 2013 05:09:11 +0000 (06:09 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 24 Nov 2013 05:09:11 +0000 (06:09 +0100)

Trivial merge