commit | dcea3a283c4877ebb3acaf005a09def34e43e31c | [log] [tgz] |
---|---|---|
author | Niels <niels.lohmann@gmail.com> | Sun Jul 24 11:16:47 2016 +0200 |
committer | Niels <niels.lohmann@gmail.com> | Sun Jul 24 11:16:47 2016 +0200 |
tree | 2c5c58199a1f9c6e7c3f55aa746192e7428066a2 | |
parent | ddfe86cc49f3c97b70efef77da505a05569a250f [diff] | |
parent | 84673b7de38df50d4cdb32a5e78e3e5857291d58 [diff] |
Merge branch 'feature/issue283' into develop (fixes #278)