Merge branch 'master' of vcs.fsf.org:enc
authorlucastx <lucas@lucasteixeira.com>
Fri, 20 Jun 2014 22:34:20 +0000 (19:34 -0300)
committerlucastx <lucas@lucasteixeira.com>
Fri, 20 Jun 2014 22:34:20 +0000 (19:34 -0300)
commit80ae2d61cf66206b080dcfbe2b3bd3b2d75ae812
tree37df0192e4539bb3f3e0b31d40198a1531a5767b
parent17151a7edd5455e03a476419631e57c4a369106b
parentef31b2010959bbb51f29c7a8da1cbbc0d958c967
Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
static