Index: trunk/src/org/openstreetmap/josm/actions/HelpAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 328)
+++ trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 339)
@@ -47,5 +47,5 @@
 
 	private JFrame helpBrowser = new JFrame("JOSM Online Help");
-	private String baseurl = Main.pref.get("help.baseurl", "http://josm.eigenheimstrasse.de");
+	private String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
 	private JEditorPane help = new JEditorPane();
 	private WikiReader reader = new WikiReader(baseurl);
Index: trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java	(revision 328)
+++ trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java	(revision 339)
@@ -162,15 +162,4 @@
 		}
 		
-		if (this.conflicts.isEmpty()) {
-			JOptionPane.showMessageDialog(Main.parent,
-					"The ConflictResolver and the Merger disagree about conflicts in your dataset.\n"+
-					"Of course, this is a bug.\n"+
-					"The bug is very old, but unfortunatly, Imi (programmer) was not able to catch it.\n"+
-					"If you know exactly what bounding boxes you downloaded (bookmarks?) and/or what\n"+
-					"files you opened (have them ready?) to display this message again, pretty please\n"+
-					"inform Imi at josm@eigenheimstrasse.de about the details.\n"+
-					"Thanks.");
-			//throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray()));
-		}
 
 		// have to initialize the JTables here and not in the declaration, because its constructor
Index: trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java	(revision 328)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java	(revision 339)
@@ -74,5 +74,5 @@
 		taggingPresetSources.setVisibleRowCount(3);
 
-		taggingPresetSources.setToolTipText(tr("The sources (url or filename) of tagging preset definition files. See http://josm.eigenheimstrasse.de/wiki/TaggingPresets for help."));
+		taggingPresetSources.setToolTipText(tr("The sources (url or filename) of tagging preset definition files. See http://josm.openstreetmap.de/wiki/TaggingPresets for help."));
 		addAnno.setToolTipText(tr("Add a new tagging preset source to the list."));
 		deleteAnno.setToolTipText(tr("Delete the selected source from the list."));