[geany-plugins: 3/3] Merge remote branch 'origin/f13/master'

[Dominic Hopf]

commit eadc7e0e2188d06d9b22241bf08c21d79d1c1470
Merge: 61234ba 0df2c75
Author: Dominic Hopf 
Date:   Sun Aug 1 01:37:04 2010 +0200

Merge remote branch 'origin/f13/master'

Conflicts:
    	.gitignore

.gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---