Merge branch 'master' into renew-documents
authorj8takagi <j8takagi@nifty.com>
Thu, 1 Nov 2012 10:02:09 +0000 (19:02 +0900)
committerj8takagi <j8takagi@nifty.com>
Thu, 1 Nov 2012 10:02:09 +0000 (19:02 +0900)

Trivial merge