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)

Trivial merge