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

[Dominic Hopf]

commit a5dec9b1f8789e5ca363c5c95356374195152a92
Merge: a79ec43 653a4a7
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Wed Dec 1 21:48:23 2010 +0100

    Merge branch 'master' into f13

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