Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
authorMart Lubbers <mart@martlubbers.net>
Wed, 5 Apr 2017 09:13:28 +0000 (11:13 +0200)
committerMart Lubbers <mart@martlubbers.net>
Wed, 5 Apr 2017 09:13:28 +0000 (11:13 +0200)
commitdcd48012f6e95d649b8fe3d0cd050ac1bdeafaf6
tree8df62c40fd8418367a986b0d3643279dd7656a98
parentf39868397acdc4cdcb71b58926dee62327933336
parent353d22af18faa93f38c47bd7095723dd9556a4e1
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask