Merge branch 'experimental/gimp-git' into refs/top-bases/experimental/updates

* experimental/gimp-git:
  latest git version of gimp
Merge commit 'refs/top-bases/experimental/updates' into experimental/updates

* commit 'refs/top-bases/experimental/updates':
  latest git version of gimp
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/updates' into refs/top-bases/experimental/updates

* refs/remotes/gh/top-bases/experimental/updates: (66 commits)
  small refactoring, make zart compile again
  cleanup comments and spaces
  indent ufraw, share common code for gmic
  Python3: fix the download URL
  plugin updates
  wpa_supplicant: Making a remote patch local.
  Adding back the 1.5 expression of mupen64plus
  Updating mupen64plus, and adding a GUI for it.
  libvirt: Update to 1.0.3
  pitz: new package
  xbmc: bump to 12.1
  Add a latest linuxPackages for living on the edge
  Add right_aws gem
  Add the nix-build `result' symlink and cpan files to gitignore
  Update rubygems
  mini-httpd: update to version 1.4
  set platforms and correct license to synergy
  httpd: Update to 2.2.24
  linux: Update to 3.2.42
  Python 3.3 upgrade to 3.3.1rc1 to fix an important bug for Nix
  ...
Merge remote-tracking branch 'refs/remotes/gh/experimental/updates' into HEAD

* refs/remotes/gh/experimental/updates: (34 commits)
  adding logkeys
  use master dvb-apps instead
  follow upstream
  support multiple vim sources
  fix typo
  adding slowhttptest
  fix vimnox
  adding taskwarrior
  fix
  adding missing patch
  drop merge failure
  fix mingw cross builds by using older compiler.
  openssl: fix mingw cross build by disabling patch
  adding dhex
  New TopGit dependency: experimental/gimp-git
  make smlnj compile on 3.x kernel
  adding smlnj, opencacade community fork tinyproxy ziproxy
  anyterm
  adding my pathselector script
  adding patch
  ...
Merge commit '7e666e21daabda903265bbf7716e05142a76eb13' into experimental/updates

* commit '7e666e21daabda903265bbf7716e05142a76eb13': (66 commits)
  small refactoring, make zart compile again
  cleanup comments and spaces
  indent ufraw, share common code for gmic
  Python3: fix the download URL
  plugin updates
  wpa_supplicant: Making a remote patch local.
  Adding back the 1.5 expression of mupen64plus
  Updating mupen64plus, and adding a GUI for it.
  libvirt: Update to 1.0.3
  pitz: new package
  xbmc: bump to 12.1
  Add a latest linuxPackages for living on the edge
  Add right_aws gem
  Add the nix-build `result' symlink and cpan files to gitignore
  Update rubygems
  mini-httpd: update to version 1.4
  set platforms and correct license to synergy
  httpd: Update to 2.2.24
  linux: Update to 3.2.42
  Python 3.3 upgrade to 3.3.1rc1 to fix an important bug for Nix
  ...