refs #199 , some formatting during "merge"

This commit is contained in:
Klaus Basan
2014-04-01 22:28:54 +02:00
parent dc1e08b312
commit 6c125ba830