Merge 'master' into x-updates
mesa: major update 10.0.4 -> 10.1.1
xorg: minor updates of three packages
xorg-server: major update 1.14.5 -> 1.15.1
xorg: revert fontsproto update, as it breaks libXfont

This partially reverts commit 30ac332563318be4e445dc3335e803326df84d3c.
https://groups.google.com/forum/#!msg/xorg-devel/SvgqiQnSN7c/f0wjRhauqvUJ

It's sad that the currently *released* versions don't even compile together,
and no dev reacts for four days so far...
xorg-server: go back to 1.14.6 due to intel problems

Again, stable releases not compiling together :-/
Add expression for cabal-install 1.20.0.0
Fix icu4c expression for latest gcc (fixes #2341)
Updated OCaml package findlib
Updated OCaml package pcre
Add expression for sage
gedit: new package

Official text editor of the GNOME desktop environment

https://wiki.gnome.org/Apps/Gedit
gnome3: moved file-roller from desktop/ to apps/
gnome3: moved gtksourceview from desktop/ to core/
gnome3: moved gnome-desktop from desktop/ to core/
libmediaart: new library used by gnome-music

Library tasked with managing, extracting and handling media art caches
xdg-user-dirs: fix finding default directory names
grilo: enable gobject introspection
gnome3: prioritize nautilus when opening inode/directory
seahorse: new package

Application for managing encryption keys and passwords in the GnomeKeyring

https://wiki.gnome.org/Apps/Seahorse