Merge branch 'master' of vcs.fsf.org:enc
authorJsx <saurabh@rebugged.com>
Tue, 1 Jul 2014 20:09:57 +0000 (01:39 +0530)
committerJsx <saurabh@rebugged.com>
Tue, 1 Jul 2014 20:09:57 +0000 (01:39 +0530)

Trivial merge