[nautilus] (7 commits) Non-fast-forward update to branch menial-but-very-rewarding-work-that-made-my-fingers-numb

[Carlos Soriano <csoriano src gnome org>]

The branch 'menial-but-very-rewarding-work-that-made-my-fingers-numb' 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:

  2302743... eel: glib-extensions: Move functions to Nautilus
  a1d23ec... properties-window: Use GLib macros to define type
  65b4201... canvas-view-container: Use GLib macros to define type
  a22b205... trash-monitor: Use GLib macros to define type
  9877422... general: Clean up headers and their inclusions
  205bc9b... tests: directory-async: Use GMainLoop

Commits added to the branch:

  cfa26f0... build: Set a couple env vars when running tests (*)
  1de2ec1... eel: glib-extensions: Move functions to Nautilus
  1e9fcce... properties-window: Use GLib macros to define type
  c268039... canvas-view-container: Use GLib macros to define type
  7696d69... trash-monitor: Use GLib macros to define type
  e686c29... general: Clean up headers and their inclusions
  f3be754... tests: directory-async: Use GMainLoop

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