[openttd/f13/master: 2/2] Merge remote branch 'origin/master' into f13

[Felix Kaechele]

commit 092122dc6d19f7578c9ed41aa96f4d912a6a014b
Merge: f035e2c faae0bb
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Thu Oct 14 22:13:13 2010 +0200

    Merge remote branch 'origin/master' into f13

 .gitignore   |    1 +
 openttd.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index ee80744,d614abd..dd3c855
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -openttd-1.0.3-RC1-source.tar.bz2
  openttd-1.0.3-source.tar.bz2
+ /openttd-1.0.4-source.tar.bz2