tree df1d4c2eef88ad36b2684438d3f09bd28758753a
parent 42c1dd94f24f6566571ba3fadc5e998d5644495d
parent 0907683274bd5f010264410bc18e8f8a13c45c00
author Nicolas De Loof <nicolas.deloof@gmail.com> 1437029871 +0200
committer Nicolas De Loof <nicolas.deloof@gmail.com> 1437029871 +0200

Merge branch 'master' into weekly