[josm] 02/04: Merge tag 'upstream/0.0.svn9229+dfsg'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository josm.

commit 24255e38d1b72ed1b5feb3d48cc36e4ab21cd09d
Merge: 3e67709 9f1f6c4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 31 18:21:45 2015 +0100

    Merge tag 'upstream/0.0.svn9229+dfsg'
    
    Upstream version 0.0.svn9229+dfsg

 REVISION                                           |  6 +--
 .../josm/actions/DistributeAction.java             |  4 +-
 .../josm/data/cache/JCSCachedTileLoaderJob.java    | 12 +++---
 .../josm/gui/oauth/OsmLoginFailedException.java    | 24 +++++------
 .../gui/oauth/OsmOAuthAuthorizationClient.java     | 14 ++-----
 .../gui/oauth/OsmOAuthAuthorizationException.java  | 28 +++++++------
 .../openstreetmap/josm/io/ProgressInputStream.java |  5 ++-
 src/org/openstreetmap/josm/tools/ColorHelper.java  |  5 ++-
 src/org/openstreetmap/josm/tools/HttpClient.java   | 33 +++++++++-------
 .../josm/actions/CombineWayActionTest.java         | 13 ++++++
 .../josm/actions/ExtensionFileFilterTest.java      | 21 ++++++++++
 .../command/conflict/ConflictAddCommandTest.java   | 17 ++++++++
 .../conflict/ConflictResolveCommandTest.java       | 27 +++++++++++++
 .../CoordinateConflictResolveCommandTest.java      | 17 ++++++++
 .../josm/data/oauth/OAuthParametersTest.java       |  2 +
 .../gui/oauth/OsmOAuthAuthorizationClientTest.java | 46 ++++++++++++++++++++++
 .../openstreetmap/josm/tools/ColorHelperTest.java  | 28 +++++++++++++
 17 files changed, 235 insertions(+), 67 deletions(-)

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