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

[Hans de Goede]

commit ca058438e7d64f57a25827b991068c11cd72c0cb
Merge: 08bf2c1 fba451a
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Nov 24 12:14:38 2014 +0100

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

 .gitignore   |    1 +
 freecol.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---