Merge branch 'tortoisemerge-apply-patch-fixes'
commit88c4293be11123a552b4eab6d059569195c817f8
authorSven Strickroth <email@cs-ware.de>
Sun, 25 Mar 2012 17:22:03 +0000 (25 19:22 +0200)
committerSven Strickroth <email@cs-ware.de>
Sun, 25 Mar 2012 17:22:03 +0000 (25 19:22 +0200)
tree3c86354fc95b4953148c1b1f4ffab04da0563208
parent8a358a480254c8333628bd565f23a8440a49be77
parentd2bd751407cf1bb258674029421171229e7eb93d
Merge branch 'tortoisemerge-apply-patch-fixes'

(fixes issue #1117)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Changelog.txt