Merge branch 'issue-3061'
commitcc417678b5b275d0573e0140463659ee089d75d4
authorSven Strickroth <email@cs-ware.de>
Thu, 2 Nov 2017 21:25:46 +0000 (2 22:25 +0100)
committerSven Strickroth <email@cs-ware.de>
Thu, 2 Nov 2017 21:25:46 +0000 (2 22:25 +0100)
tree6b98a98beeda3f58c7f5975ce901ae56a5ccc2f9
parentfd7726a15b24a727029fe7aaab3b68976a28d1b8
parent3cf31f87cc3fb12130a64d3768df2f3aaecbaa32
Merge branch 'issue-3061'