Merge branch 'master' of vcs.fsf.org:enc
authorJuan M.G. Salcines <jmgsalcines@mykolab.com>
Fri, 18 Jul 2014 18:07:17 +0000 (20:07 +0200)
committerJuan M.G. Salcines <jmgsalcines@mykolab.com>
Fri, 18 Jul 2014 18:07:17 +0000 (20:07 +0200)
commita1c9ab5618b366139c0a9cf11499c99a15a0a83a
treeedb3d99c7c52c469b672c58277e7701489958489
parenta7a47fd514a17ad7d0643691476573df65021c96
parent2e19a499a67466e40272d7b00ca3cbac6735ce0d
Merge branch 'master' of vcs.fsf.org:enc