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

[Dominic Hopf]

commit 080bc4039d2c39c5e780945b5d089e351e83ce7a
Merge: 7725267 11f8520
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sat Jan 8 02:42:03 2011 +0100

    Merge branch 'master' into f13

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