[freeciv/f14/master: 9/9] Merge branch 'f15' into f14

[Jon Ciesla]

commit f5fa0cdcc578af88c3fa353e64330e0608dc44a8
Merge: 070df31 0bb678a
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Wed Mar 9 08:19:59 2011 -0600

    Merge branch 'f15' into f14
    
    Conflicts:
    	.gitignore
    	freeciv.spec
    	sources

 .gitignore   |    4 +---
 freeciv.spec |   10 ++++++++--
 sources      |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index d752b6e,892b342..d248970
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,1 @@@
--freeciv-2.2.0.tar.bz2
--freeciv-2.2.2.tar.bz2
--/freeciv-2.2.4.tar.bz2
+ /freeciv-2.2.5.tar.bz2