Merge branch 'master'
authorj8takagi <j8takagi@nifty.com>
Sun, 10 Nov 2013 03:56:20 +0000 (12:56 +0900)
committerj8takagi <j8takagi@nifty.com>
Sun, 10 Nov 2013 03:56:20 +0000 (12:56 +0900)

Trivial merge