Merge branch 'master' of ssh://rtime.felk.cvut.cz/can-benchmark
authorMartin Hořeňovský <Martin.Horenovsky@gmail.com>
Mon, 16 Sep 2013 18:49:36 +0000 (20:49 +0200)
committerMartin Hořeňovský <Martin.Horenovsky@gmail.com>
Mon, 16 Sep 2013 18:49:36 +0000 (20:49 +0200)

Trivial merge