Merge branch 'master' of vcs.fsf.org:enc
authorlenieto3 <lenieco@gmail.com>
Tue, 24 Jun 2014 19:04:46 +0000 (14:04 -0500)
committerlenieto3 <lenieco@gmail.com>
Tue, 24 Jun 2014 19:04:46 +0000 (14:04 -0500)
commit76e8d670ca311666094510bd652ec81bbcf00561
tree96ba99bd9f4b8a07441909c22e2303f99ce53409
parent4216d88ae48bffa3cdd2b1fc6b7ae74d776aa72c
parentcb8c0a4b0b95eac5cb2997b7ace8303ad8b06c19
Merge branch 'master' of vcs.fsf.org:enc