[qlandkartegt/f13/master: 2/2] Merge branch 'master' into f13

[Dan Horák]

commit 269d8e9071115d9ed7259470b82757c9532f2835
Merge: 7e6a68f ef98c7e
Author: Dan Horák <dan at danny.cz>
Date:   Thu Jan 27 16:28:05 2011 +0100

    Merge branch 'master' into f13

 .gitignore        |    1 +
 qlandkartegt.spec |    7 +++++--
 sources           |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---