tree 50c0738dc17e2d37442cfff3a22f7ae907650bdc
parent 46c675c450b7bdeffeb1c48b435a00c1966480f3
parent aa188cfcf9c9b3613e08a2b298d0d685d2283d02
author Nicolas De Loof <nicolas.deloof@gmail.com> 1435311158 +0200
committer Nicolas De Loof <nicolas.deloof@gmail.com> 1435311158 +0200

Merge branch 'master' into weekly