[freecol/f21: 3/3] Merge remote-tracking branch 'origin/master' into f21

[Hans de Goede]

commit 08bf2c123499d29c9d9a605788792cc3c1e948cb
Merge: 2970a38 e9ab4c0
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu Oct 23 10:25:21 2014 +0200

    Merge remote-tracking branch 'origin/master' into f21

 .gitignore                                         |    1 +
 ...nd-Java-crash-when-stopping-opening-video.patch |   83 --------------------
 freecol-fix-makeindex-invocation.patch             |   12 ++--
 freecol-no-classpath-in-MF.patch                   |   27 ++++---
 freecol-source-encoding.patch                      |   11 +++
 freecol.sh                                         |    2 +-
 freecol.spec                                       |   17 +++--
 sources                                            |    2 +-
 8 files changed, 47 insertions(+), 108 deletions(-)
---