[jabref] 328/459: Merge branch 'experimental' of colleen:debian/jabref into experimental

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository jabref.

commit e5db284d54ba6950f360af432c55c9887f81621f
Merge: 7d6ec94 146c80b
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Oct 29 21:52:01 2012 +0100

    Merge branch 'experimental' of colleen:debian/jabref into experimental
    
    Conflicts:
    	debian/patches/02_libs.patch
    	debian/patches/series


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