tree 6a01743beda4cec13cd3edee3320ce0016c3a3a6
parent 26cab42c382b2a0ff7a8f3d45b3219721ad63906
parent 6e1347e68c9d03f3b2563ed972e77c03d688a151
author Niels <niels.lohmann@gmail.com> 1467385262 +0200
committer Niels <niels.lohmann@gmail.com> 1467385262 +0200

Merge branch 'develop' into feature/improved_documentation