tree 0dcde6a742d005004ba61de31a317f7784bd8fe0
parent 1fc0565aa9b0b02ab6cbcb9dcb7d7524bdceddd9
parent 1ce4469fd20a466984607ce0d075cb213e9c86f9
author Roman Khassraf <roman@khassraf.at> 1438771893 +0200
committer Roman Khassraf <roman@khassraf.at> 1438771893 +0200

Merged origin/test-utils-98 into dev, fixed conflicts