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

[James Downing Page]

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

jamespage pushed a commit to branch master
in repository lucene-solr.

commit 49df849e19e8a65ea13d017afeefa249477cad14
Merge: 26a4b9e d2d8245
Author: James Page <james.page at ubuntu.com>
Date:   Sat Dec 14 22:09:27 2013 +0000

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/lucene-solr
    
    Conflicts:
    	debian/changelog


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