[wesnoth/f14/master: 2/2] Merge branch 'master' into f14

[Jon Ciesla]

commit ab617578c0b75e1d0da508dce0e0743e1c256224
Merge: de8e0e9 b55eb3f
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Sep 30 12:19:33 2010 -0500

    Merge branch 'master' into f14

 .gitignore   |    1 +
 sources      |    2 +-
 wesnoth.spec |   10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)
---