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)
commit1b6ef8228491f3798b83badd4b0997c259938235
treef21604997fca1c8ccecde2ac6fac3f6e2b1e9d78
parent08f4834d4c8634ba0b582189837bc083938d6097
parentebb2d80ba465affde8c08fc85826792183f99e06
Merge remote-tracking branch 'origin/master'