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)
commite5db284d54ba6950f360af432c55c9887f81621f
tree2a39dd7309e69615ddf5d3d5b52414517754fe9e
parent7d6ec9496a12229ef0362c763c716aee42481a9b
parent146c80bea92d65774ccc178be834da86977cfebc
Merge branch 'experimental' of colleen:debian/jabref into experimental

Conflicts:
debian/patches/02_libs.patch
debian/patches/series