[gnome-flashback] (2 commits) Non-fast-forward update to branch wip/segeiger/gnome-3-18-inputmethods

[Sebastian Geiger <segeiger src gnome org>]

The branch 'wip/segeiger/gnome-3-18-inputmethods' 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:

  842cc29... input-sources: implement auxiliary and preedit text callbac
  021aa1e... input-sources: implement candidate popup functionality

Commits added to the branch:

  f0e99f0... input-sources: implement auxiliary and preedit text callbac (*)
  cef2a7d... input-sources: implement candidate popup functionality

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