Merge branch 'fa-dev' of vcs.fsf.org:enc into fa-dev
authorMohammad Mehdi Habibi <mohammad.habibi@lazada.com>
Wed, 5 Oct 2016 06:16:23 +0000 (13:16 +0700)
committerMohammad Mehdi Habibi <mohammad.habibi@lazada.com>
Wed, 5 Oct 2016 06:16:23 +0000 (13:16 +0700)

Trivial merge