[glib/wip/gsettings-list] (19 commits) ...Merge branch 'master' into wip/gsettings-list

[Rodrigo Moya <rodrigo src gnome org>]

Summary of changes:

  b92e2cd... gio: Remove unused variables from test (*)
  b9a98a8... gio: Comment out a whole test (*)
  6774026... gobject: Cast token type to guint to avoid gcc warning (*)
  889889a... glib: Fix enumeration warnings from gcc 4.5 (*)
  8f19d06... Fix typo in docs for extension point (*)
  426f90e... Resolve warnings about istream and ostream in socket test (*)
  05428e3... glib: Document g_string_free semantics better in the FALSE  (*)
  8071012... Avoid shadowing the dir builtin (*)
  d11f413... introspection: Remove spurious trailing : (*)
  99332dd... Avoid shadowing dir builtin (*)
  6585729... Reword awkward sentence in the docs (*)
  4b28e6a... Add missing Since: tag (*)
  5b43de2... Updated Traditional Chinese translation(Hong Kong and Taiwa (*)
  b52294d... Try to fix the version test on builders (*)
  1a63892... Updated Hebrew translation (*)
  8530a3b... Added note in g_slist_free about using *free_full to mirror (*)
  67ab557... Update Simplified Chinese translation. (*)
  6b631fa... Complete Simplified Chinese translation. (*)
  65bd1f5... Merge branch 'master' into wip/gsettings-list

(*) This commit already existed in another branch; no separate mail sent