[gtk] (4 commits) Non-fast-forward update to branch matthiasc/for-master

[Matthias Clasen <matthiasc src gnome org>]

The branch 'matthiasc/for-master' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  4f2143e... gkt-demo: Add a columview to the scroll demo
  fbbfc97... gtk-demo: Plug a memory leak

Commits added to the branch:

  a745dbf... gkt-demo: Add a columview to the scroll demo (*)
  2543c9f... Merge branch 'matthiasc/for-master' into 'master' (*)
  192f515... gtk-demo: Tweak a demo title
  3e8260d... gtk-demo: Plug a memory leak

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