Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
authorMart Lubbers <mart@martlubbers.net>
Thu, 22 Jun 2017 09:30:52 +0000 (11:30 +0200)
committerMart Lubbers <mart@martlubbers.net>
Thu, 22 Jun 2017 09:30:52 +0000 (11:30 +0200)
commit6d956995e169ae8fd44d62e26e35d499a9660225
treefd17a3eaefa5f894ad786c99dd8e6de777111104
parent9b185b6f0d9d08bd5e3305ee9ebc50e1ff3737a9
parent3fe035b92e9bc0b745c57db64e78461b2f36b6d1
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask