From: lucastx <lucas@lucasteixeira.com>
Date: Fri, 20 Jun 2014 22:34:20 +0000 (-0300)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=80ae2d61cf66206b080dcfbe2b3bd3b2d75ae812;p=enc.git

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

Conflicts:
	static
---

80ae2d61cf66206b080dcfbe2b3bd3b2d75ae812