Merge branch 'master' of vcs.fsf.org:enc-static
authortekrei <tekrei@gmail.com>
Sat, 21 Jun 2014 05:33:01 +0000 (08:33 +0300)
committertekrei <tekrei@gmail.com>
Sat, 21 Jun 2014 05:33:01 +0000 (08:33 +0300)

Trivial merge