[openttd/f18: 3/3] Merge branch 'master' into f18

[Felix Kaechele]

commit 7a3599365aa6fb3c20995a0bf42ba171f863d2d7
Merge: 2c04f79 3304bc9
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Fri Dec 13 00:02:28 2013 +0100

    Merge branch 'master' into f18

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