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

[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 5840278512841c77f7cd0d4c904dcca9715ef944
Merge: 9c17a25 c5af204
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 20 23:02:49 2016 +0200

    Merge tag 'upstream/2.9.4'
    
    Upstream version 2.9.4

 README.md                                          |   8 +-
 RELEASE-NOTES.txt                                  |   8 +-
 pom.xml                                            |   8 +-
 src/conf/MANIFEST.MF                               |  18 +-
 .../java/org/joda/time/tz/ZoneInfoProvider.java    |  18 +-
 src/main/java/org/joda/time/tz/src/Readme.txt      |   2 +-
 src/main/java/org/joda/time/tz/src/asia            | 286 ++++++++++++++++-----
 src/main/java/org/joda/time/tz/src/europe          |  98 ++++---
 src/main/java/org/joda/time/tz/src/northamerica    |  12 +
 src/main/java/org/joda/time/tz/src/southamerica    |  18 +-
 src/site/markdown/index.md                         |   8 +-
 src/site/xdoc/installation.xml                     |   1 +
 .../site/xdoc/upgradeto294.xml                     |  36 ++-
 src/test/java/org/joda/time/TestDateTimeZone.java  |  33 +++
 14 files changed, 408 insertions(+), 146 deletions(-)

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