[libjoda-time-java] 02/05: Merge tag 'upstream/2.9.6'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libjoda-time-java.

commit 6bc1290c06074f3d57d167e38f2229b52e3f4b44
Merge: 5c548b8 c7b93f5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 11 22:09:59 2016 +0100

    Merge tag 'upstream/2.9.6'
    
    Upstream version 2.9.6

 README.md                                          |   8 +-
 RELEASE-NOTES.txt                                  |  36 +-
 pom.xml                                            |  77 ++-
 src/conf/MANIFEST.MF                               |  18 +-
 .../java/org/joda/time/DateTimeComparator.java     |   6 +
 src/main/java/org/joda/time/DateTimeZone.java      |  18 +
 src/main/java/org/joda/time/Duration.java          |  27 +-
 .../java/org/joda/time/base/AbstractDuration.java  |   4 +-
 .../java/org/joda/time/base/AbstractInstant.java   |  24 +-
 .../java/org/joda/time/base/AbstractPartial.java   |   4 +-
 src/main/java/org/joda/time/field/FieldUtils.java  |  23 +
 .../joda/time/format/DateTimeFormatterBuilder.java | 101 ++--
 .../org/joda/time/format/messages_no.properties    |  22 +
 .../java/org/joda/time/tz/DateTimeZoneBuilder.java |  41 +-
 .../java/org/joda/time/tz/ZoneInfoCompiler.java    |  19 +-
 src/main/java/org/joda/time/tz/src/Readme.txt      |   2 +-
 src/main/java/org/joda/time/tz/src/africa          |  12 +-
 src/main/java/org/joda/time/tz/src/antarctica      |  88 ++--
 src/main/java/org/joda/time/tz/src/asia            | 249 +++++-----
 src/main/java/org/joda/time/tz/src/australasia     |  56 ++-
 src/main/java/org/joda/time/tz/src/backward        |   1 +
 src/main/java/org/joda/time/tz/src/etcetera        |  74 ++-
 src/main/java/org/joda/time/tz/src/europe          | 531 ++++++++++++---------
 src/main/java/org/joda/time/tz/src/northamerica    |  79 ++-
 src/main/java/org/joda/time/tz/src/southamerica    |  20 +-
 src/site/markdown/index.md                         |   6 +-
 src/site/xdoc/installation.xml                     |   2 +
 .../site/xdoc/upgradeto295.xml                     |  59 ++-
 .../site/xdoc/upgradeto296.xml                     |  64 ++-
 .../java/org/joda/time/TestDateTimeComparator.java |  10 +
 src/test/java/org/joda/time/TestDateTimeZone.java  |  64 ++-
 .../java/org/joda/time/TestDuration_Basics.java    |  26 +
 .../joda/time/convert/TestCalendarConverter.java   |   8 +-
 .../java/org/joda/time/field/TestFieldUtils.java   |  30 ++
 .../org/joda/time/format/TestDateTimeFormat.java   |  16 +-
 .../joda/time/format/TestDateTimeFormatter.java    |   2 +-
 .../time/format/TestDateTimeFormatterBuilder.java  | 100 ++++
 37 files changed, 1287 insertions(+), 640 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjoda-time-java.git