Merge branch 'master' of git.fsij.org:fsij-homepage
authorNIIBE Yutaka <gniibe@fsij.org>
Tue, 27 May 2014 11:27:22 +0000 (20:27 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Tue, 27 May 2014 11:27:22 +0000 (20:27 +0900)

Trivial merge