Merge remote-tracking branch 'origin/master'
authorprudemar <prudemar@fel.cvut.cz>
Fri, 6 Mar 2015 18:03:44 +0000 (19:03 +0100)
committerprudemar <prudemar@fel.cvut.cz>
Fri, 6 Mar 2015 18:03:44 +0000 (19:03 +0100)

Trivial merge