Merge branch 'master' of vcs.fsf.org:enc
authorYongmin Hong <revi@member.fsf.org>
Tue, 24 Jun 2014 15:10:16 +0000 (00:10 +0900)
committerYongmin Hong <revi@member.fsf.org>
Tue, 24 Jun 2014 15:10:16 +0000 (00:10 +0900)

Trivial merge