tree c4b01354e0d6743fc252a255a9f1c5831e0abea5
parent a68d0ad5cd72612e5070a277936cad7dffea6617
parent 00179dbb71364f30934bfc56abd0e053a703c8fd
author Piotr Zalewa <piotr@zalewa.info> 1403683927 +0200
committer Piotr Zalewa <piotr@zalewa.info> 1403683927 +0200

Merge remote-tracking branch 'marti/CB-6832'