Merge branch 'tortoisemerge-update'
commit81293e8710b416ae5dec084d874187b195b0e751
authorSven Strickroth <email@cs-ware.de>
Sun, 30 Dec 2012 23:43:57 +0000 (31 00:43 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 30 Dec 2012 23:43:57 +0000 (31 00:43 +0100)
treeeb6b4ac2cd50073ceb04e1bdc8b7678d1db6f598
parentf9e1cac82c182e0827952d3a5369125f0b8a9aaa
parent7b030729204ef5f03625d83acdf168dc0e14c987
Merge branch 'tortoisemerge-update'

Signed-off-by: Sven Strickroth <email@cs-ware.de>