[josm-plugins] 02/05: Merge tag 'upstream/0.0.svn31893+ds'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm-plugins.

commit fe72b28b51d98b7f4d7115640371767ae9a1e887
Merge: 56fccb4 842b224
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 31 15:19:26 2015 +0100

    Merge tag 'upstream/0.0.svn31893+ds'
    
    Upstream version 0.0.svn31893+ds

 DirectUpload/build.xml                             |  2 +-
 .../josm/plugins/DirectUpload/UploadDataGui.java   | 40 +++++++++-------------
 .../plugins/DirectUpload/UploadOsmConnection.java  | 16 ++++-----
 build-common.xml                                   |  4 +--
 svn-info.xml                                       | 10 +++---
 5 files changed, 33 insertions(+), 39 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git