Merge branch 'columnmanager'
commit8603d4225223b8cef5a6972c6120e13cdcf4b927
authorSven Strickroth <email@cs-ware.de>
Sat, 23 Jul 2016 22:45:13 +0000 (24 00:45 +0200)
committerSven Strickroth <email@cs-ware.de>
Sat, 23 Jul 2016 22:45:13 +0000 (24 00:45 +0200)
tree4bcfd93e7e7655d602acfe04ea066fcbff575bc7
parent9552ceed0c53436a6ccdfcf2f85e7b00d49e2b38
parenta647def6f3bf080841c59ac8c40574ae87d23e25
Merge branch 'columnmanager'