[freeciv/f13/master: 16/16] Merge branch 'f14' into f13

[Jon Ciesla]

commit 08ac3b9418503699cfa7cbcde4d25d63d8cf9574
Merge: 9795fe9 f5fa0cd
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Wed Mar 9 08:36:05 2011 -0600

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

 .gitignore   |    3 +--
 freeciv.spec |   30 ++++++++++++++----------------
 sources      |    2 +-
 3 files changed, 16 insertions(+), 19 deletions(-)
---