[jabref] 428/459: Merge tag 'upstream/2.10+ds'

[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 59d69002f49497ead658c5fdc85fc7d14384d716
Merge: d68c55a b81b04b
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Mar 12 18:26:57 2014 +0100

    Merge tag 'upstream/2.10+ds'
    
    Upstream version 2.10+ds
    
    Conflicts:
    	src/txt/CHANGELOG

 README.md                                          |    7 +
 build.xml                                          |    6 +-
 src/help/RevisionHistory.html                      |   33 +
 src/images/splash-release.svg                      |   52 +-
 src/images/splash.png                              |  Bin 222436 -> 186917 bytes
 src/java/net/sf/jabref/FileTab.java                |    4 +-
 .../jabref/groups/EntryTableTransferHandler.java   |    7 +-
 .../imports/EntryFromFileCreatorManager.java       |   19 +-
 .../net/sf/jabref/imports/EntryFromPDFCreator.java |   28 +-
 src/java/net/sf/jabref/imports/HTMLConverter.java  |   14 +-
 .../net/sf/jabref/imports/IEEEXploreFetcher.java   |   22 +-
 src/java/spl/PdfImporter.java                      |   99 +-
 src/java/spl/gui/ImportDialog.java                 |   11 +-
 src/resource/JabRef_ru.properties                  | 3136 ++++++++++----------
 src/resource/Menu_no.properties                    |    1 -
 src/resource/Menu_ru.properties                    |  246 +-
 src/txt/CHANGELOG                                  |    9 +-
 src/txt/README                                     |    5 +-
 src/windows/nsis/setup.nsi                         |    7 +-
 19 files changed, 1909 insertions(+), 1797 deletions(-)

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