[geany/geany] 70f41f: Merge branch 'master' of github.com:geany/geany

[enrico.troeger at uvena.de]

  Branch: refs/heads/master
  Home:   https://github.com/geany/geany

  Commit: 70f41f6485c717a6c5e988062f823628c559740f
      https://github.com/geany/geany/commit/70f41f6485c717a6c5e988062f823628c559740f
  Author: Enrico Tröger <enrico.troeger at uvena.de>
  Date:   2011-11-13 (Sun, 13 Nov 2011)

  Changed paths:
    M HACKING
  M data/filetype_extensions.conf
  M data/filetypes.html
  A data/filetypes.objectivec
  M data/filetypes.php
  M data/filetypes.xml
  M src/Makefile.am
  M src/dialogs.c
  M src/document.c
  M src/filetypes.c
  M src/filetypes.h
  M src/highlighting.c
  A src/highlightingmappings.h
  M tagmanager/Makefile.am
  M tagmanager/makefile.win32
  A tagmanager/objc.c
  M tagmanager/parsers.h
  M wscript

  Log Message:
  -----------
  Merge branch 'master' of github.com:geany/geany