tree 3864f6c01d3be6dee707f78501c7ef39cf8d49ce
parent eac1dbe8cf31af3edff8a85a9e41c3a8ddd067b3
parent ae8f8ed1bc623a85adc46343d320a7f9346d1882
author Nicolas De Loof <nicolas.deloof@gmail.com> 1435836673 +0200
committer Nicolas De Loof <nicolas.deloof@gmail.com> 1435836673 +0200

Merge branch 'master' into weekly