[nautilus] (2 commits) Non-fast-forward update to branch wip/corey/dnd-hack

[Corey Berla <coreyberla src gnome org>]

The branch 'wip/corey/dnd-hack' 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:

  d4eb08f... dnd: Cleanup calls to gdk_drop_get_actions()
  1853334... dnd: Temporary fix for getting the preferred action on an x

Commits added to the branch:

  b49a31e... dnd: Cleanup calls to gdk_drop_get_actions()
  f14ea94... dnd: Temporary fix for getting the preferred action on an x