lanc33/Tinyboard — pull request #1 by czaks (2013-06-15 06:21:13+00:00)
Title: fixed merge with vichan-devel

my merge is better, because it conserves the commit information, yours does not