From: Juan Jose Olivera <juan@genso.com.bo>
Date: Tue, 24 Jun 2014 15:26:13 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a80d0037e4413665368eeb1029c824ccadb9ff76;p=enc-live.git

Merge branch 'master' of vcs.fsf.org:enc
---

a80d0037e4413665368eeb1029c824ccadb9ff76