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)
commit0174f645d64fbb6e1280c2bb225273f429dff187
tree9a2c62cd43da4592b5c46080e8f3cfb8afda4ab4
parent678dd60ed95c50064bf8266f71ecf1b026dc3877
parent0c777e2b120ebdb407cc5cbbd29dda16353cd931
Merge branch 'master' of ssh://anxur.fi.muni.cz/~kas/html/git/tinyboard

 especially if it merges an updated upstream into a topic branch.