Merge branch 'master' of vcs.fsf.org:enc-static
authorJuan M.G. Salcines <jmgsalcines@mykolab.com>
Fri, 18 Jul 2014 07:22:25 +0000 (09:22 +0200)
committerJuan M.G. Salcines <jmgsalcines@mykolab.com>
Fri, 18 Jul 2014 07:22:25 +0000 (09:22 +0200)
commitf96f85a313ff60a61ca1e394563068c3a5d8b14c
treedd3ff2b88f9d0353dc0857b8b293bebea629bf21
parentea20e9d9d3244f4e8f1299814ffa3e8e4ab4604e
parent9ca18b89de02299d9be280cddfc67fe8b347a523
Merge branch 'master' of vcs.fsf.org:enc-static