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

[Dominic Hopf]

commit 7725267b2410de98ea164a07e24b4fbafa8ac837
Merge: a5dec9b c758174
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Thu Jan 6 23:14:44 2011 +0100

    Merge branch 'master' into f13

 .gitignore               |    1 +
 ethos-1.0.c.tags         |  190 +++++
 geany.spec               |   44 +-
 gladeui-1.0.c.tags       | 1927 ++++++++++++++++++++++++++++++++++++++++++++++
 gnt.c.tags               | 1136 +++++++++++++++++++++++++++
 gtkscintilla-2.0.c.tags  | 1010 ++++++++++++++++++++++++
 gtksourceview-3.0.c.tags |  701 +++++++++++++++++
 libdevhelp-2.0.c.tags    |  216 ++++++
 libgdl-3.0.c.tags        |  345 +++++++++
 sources                  |    2 +-
 v4l2.c.tags              | 1091 ++++++++++++++++++++++++++
 webkit-1.0.c.tags        |  719 +++++++++++++++++
 wordpress.php.tags       |  161 ++++
 13 files changed, 7526 insertions(+), 17 deletions(-)
---