Index: /applications/editors/josm/plugins/CommandLine/build.xml
===================================================================
--- /applications/editors/josm/plugins/CommandLine/build.xml	(revision 29565)
+++ /applications/editors/josm/plugins/CommandLine/build.xml	(revision 29566)
@@ -2,5 +2,5 @@
 <project name="CommandLine" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="Moar bugfixes"/>
+    <property name="commit.message" value="JOSM/CommandLine: added timeout commandline.timeout ms"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="5874"/>
Index: /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java
===================================================================
--- /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java	(revision 29565)
+++ /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java	(revision 29566)
@@ -584,5 +584,5 @@
         synchronized (syncObj) {
             try {
-                syncObj.wait(10000);
+                syncObj.wait(Main.pref.getInteger("commandline.timeout", 20000));
             } catch (InterruptedException e) {
             }