chiark / gitweb /
Merge branch 'master' into tesseract
authorDavid Martínez <contacto@davidmartinez.net>
Sat, 6 Feb 2016 13:00:58 +0000 (14:00 +0100)
committerDavid Martínez <contacto@davidmartinez.net>
Sat, 6 Feb 2016 13:00:58 +0000 (14:00 +0100)
commita4279e8660fe2dc1c9c910649f32a9dea8092a58
tree06e6fcfa300fe113f34ba5dd69bbfd89f16372a8
parent93779b4a2b5ab1599b30a2c5fcf51697c7134408
parent4348c5262394d454c6036db05f836fe095b026fd
Merge branch 'master' into tesseract