update to Diff v1.15 (2013/04/01) from http://www.bmsi.com/java/#diff

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6224 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror