Merge branch 'master' of vcs.fsf.org:enc-live
authork054 <kosa@riseup.net>
Thu, 3 Dec 2015 00:28:05 +0000 (19:28 -0500)
committerk054 <kosa@riseup.net>
Thu, 3 Dec 2015 00:28:05 +0000 (19:28 -0500)
commit3c10fdb35d01731f52b857693f62e319c8b05d8a
treef7f35690079933b05246feda73d377e1b7825f40
parente9de05a9f691466bec7dc5fc6fbefa19780e8f9d
parent61523e19beb09b58e395039bd70279ea863ab542
Merge branch 'master' of vcs.fsf.org:enc-live

Conflicts:
es/index.html
es/index.html