Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
authorMart Lubbers <mart@martlubbers.net>
Mon, 3 Apr 2017 08:25:59 +0000 (10:25 +0200)
committerMart Lubbers <mart@martlubbers.net>
Mon, 3 Apr 2017 08:25:59 +0000 (10:25 +0200)
commit88ecd686ff62986cde139abb65ab52b9e93d3035
treedeb36722e508174ece76653a896a4f5495a3c42a
parentffa2d86b82f26ed05ed524d3027c679420d13553
parentaf56e47862b8dd933d6f5c75b10aa8eafd78fb1e
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask