tree e1654d66c328f22b191d4c3fff63c974970af49d
parent dfeddda647fc98774c01eec1f10f6e8d27569deb
parent f4c2bb3d197ae24263969fbf2caafbd354e9c9ae
author Filip Pytloun <filip@pytloun.cz> 1498567832 +0200
committer Filip Pytloun <filip@pytloun.cz> 1498567832 +0200

Merge remote-tracking branch 'gerrit/master'