Revision b043924805cf694e80a237385cf25743fe62f8e8

Committed on 22/01/2015 7:18 am by alexanderxrow <alexander@xrow.de> [GitHub Diff]

conflicts solved