Merge branch 'master' of ssh://anxur.fi.muni.cz/~kas/html/git/tinyboard
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Sun, 10 Apr 2016 17:38:58 +0000 (19:38 +0200)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Sun, 10 Apr 2016 17:38:58 +0000 (19:38 +0200)

Trivial merge