tree 4fbff154e3f473d9edd79acc251b183efa8f1d23
parent aec952fdb6f8500726317ff99da77f74d25ab45a
parent aaaa9c5fefbbbf1ccd8583dab486c68aaaac37f1
author Nicolas De Loof <nicolas.deloof@gmail.com> 1439964655 +0200
committer Nicolas De Loof <nicolas.deloof@gmail.com> 1439964655 +0200

Merge branch 'master' into weekly