Merge branch 'master' of vcs.fsf.org:enc
authorLisa Marie Maginnis <lisam@fsf.org>
Mon, 30 Jun 2014 04:22:06 +0000 (00:22 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Mon, 30 Jun 2014 04:22:06 +0000 (00:22 -0400)
commitdd22ce02cc707a63be16d53517b0c94026faab4b
tree155ba4c1c19a4c62aebec1487dff46fda86120aa
parent9906192561223255d315be757e8b8d530649e712
parenta9115c7e6f25a0346262028e386a08acb8e721d2
Merge branch 'master' of vcs.fsf.org:enc