Merge branch 'master' of vcs.fsf.org:enc
authorLisa Marie Maginnis <lisam@fsf.org>
Mon, 30 Jun 2014 14:51:35 +0000 (10:51 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Mon, 30 Jun 2014 14:51:35 +0000 (10:51 -0400)
commitb8f5ccb4033819f3792269d594c6e7a98cff0472
treee0dfbc315b03701de7ebabc57de256321f865072
parent8f6158624bd802bdebfbe4128aab30770e88b224
parent177e07137b9c795e0529f6e3e1b5b80a931b0100
Merge branch 'master' of vcs.fsf.org:enc