projects / enc-live.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7a47fd 2e19a49)
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)

Trivial merge