Merge branch 'experimental' of colleen:debian/jabref into experimental
authorgregor herrmann <gregoa@debian.org>
Mon, 29 Oct 2012 20:52:01 +0000 (21:52 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 29 Oct 2012 20:52:01 +0000 (21:52 +0100)
Conflicts:
debian/patches/02_libs.patch
debian/patches/series


Trivial merge