Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
authorMart Lubbers <mart@martlubbers.net>
Mon, 10 Apr 2017 10:18:23 +0000 (12:18 +0200)
committerMart Lubbers <mart@martlubbers.net>
Mon, 10 Apr 2017 10:18:23 +0000 (12:18 +0200)
commit2ebe31dbe4aeaae68d63ccdcb9072dec8c4180f6
tree64c1cf5e901afdc4d61c987354acdbd82fc28624
parentcc93aff1c0867a33c41b4120c001b407d1b8850a
parent61dffbc509a02622642a6eb7c17cb20b46b93619
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask