Merge branch 'master' of ssh://anxur.fi.muni.cz/~kas/html/git/tinyboard
authorJan "Yenya" Kasprzak <kas@fi.muni.cz>
Fri, 10 May 2013 20:14:12 +0000 (22:14 +0200)
committerJan "Yenya" Kasprzak <kas@fi.muni.cz>
Fri, 10 May 2013 20:14:12 +0000 (22:14 +0200)
 especially if it merges an updated upstream into a topic branch.


Trivial merge