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

[Felix Kaechele]

commit 62cf68dff4324e78d16c589e5041a0f2dccffe34
Merge: 58e2e0a 7242f69
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Sun Jul 28 13:16:42 2013 +0200

    Merge branch 'master' into f18
    
    Conflicts:
    	openttd.spec

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