[jnr-netdb] 06/10: Merge tag 'upstream/1.1.5'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jnr-netdb.

commit 037d68fe7b14296a66328d86b09891637f8f68df
Merge: 06e8ccd d2f9359
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 4 09:54:33 2016 +0200

    Merge tag 'upstream/1.1.5'
    
    Upstream version 1.1.5

 .classpath                            |  8 ------
 .project                              | 23 ---------------
 .settings/org.eclipse.jdt.core.prefs  |  6 ----
 .settings/org.eclipse.jdt.ui.prefs    | 54 -----------------------------------
 .settings/org.maven.ide.eclipse.prefs |  9 ------
 .travis.yml                           |  4 ---
 pom.xml                               |  4 +--
 7 files changed, 2 insertions(+), 106 deletions(-)

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