[knopflerfish-osgi] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository knopflerfish-osgi.

commit 8592fc2f80615a562a9fe8e04ba17d2006e04be0
Merge: 540068b 4e9b2ba
Author: Felix Natter <fnatter at gmx.net>
Date:   Fri Mar 30 17:39:03 2018 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/knopflerfish-osgi

 debian/patches/40_ignore_android.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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