ml: Merge branch 'master' of vcs.fsf.org:enc
authorJsx <saurabh@rebugged.com>
Sun, 6 Jul 2014 20:15:38 +0000 (01:45 +0530)
committerJsx <saurabh@rebugged.com>
Sun, 6 Jul 2014 20:15:38 +0000 (01:45 +0530)

Trivial merge