Merge branch 'master' of vcs.fsf.org:enc
authorLucas Teixeira <lucas@lucasteixeira.com>
Tue, 24 Jun 2014 01:32:54 +0000 (22:32 -0300)
committerLucas Teixeira <lucas@lucasteixeira.com>
Tue, 24 Jun 2014 01:32:54 +0000 (22:32 -0300)
commitf8f64aa93b9ce4e254b0d1eb67c547463caf6c2f
tree0340cd58c28f2a97e2178e3f350d4c70b0124f86
parent2f0c695da3ddb58b6722a7bcd96108b7897fc3f0
parentfc74bea3dacd6addae39438ee5b9079680046132
Merge branch 'master' of vcs.fsf.org:enc