projects / enc-live.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0db3739 14f29fa)
Merge branch 'master' of vcs.fsf.org:enc
authorThiago Marinello <marinello@acm.org>
Mon, 23 Jun 2014 22:24:33 +0000 (19:24 -0300)
committerThiago Marinello <marinello@acm.org>
Mon, 23 Jun 2014 22:24:33 +0000 (19:24 -0300)

Trivial merge