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

[Dominic Hopf]

commit 7ef1697b9c8cdd1234d5c143cea30399f005b8d5
Merge: 669becd 11f8520
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sat Jan 8 02:37:48 2011 +0100

    Merge branch 'master' into f14

 geany.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---