projects / enc-live.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 640aa04 616fab7)
Merge branch 'master' of vcs.fsf.org:enc
authorJuan Jose Olivera <juan@genso.com.bo>
Tue, 24 Jun 2014 15:26:13 +0000 (11:26 -0400)
committerJuan Jose Olivera <juan@genso.com.bo>
Tue, 24 Jun 2014 15:26:13 +0000 (11:26 -0400)

Trivial merge