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

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

* commit 'refs/top-bases/experimental/updates':
  updates
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/updates' into refs/top-bases/experimental/updates

* refs/remotes/gh/top-bases/experimental/updates:
Merge commit '301e075a291ec4005dd12d12c13396f346dce05a' into experimental/gimp-git

* commit '301e075a291ec4005dd12d12c13396f346dce05a':
Merge branch 'experimental/gimp-git' into refs/top-bases/experimental/updates

* experimental/gimp-git:
Merge remote-tracking branch 'refs/remotes/gh/experimental/updates' into HEAD

* refs/remotes/gh/experimental/updates: (55 commits)
  kak update
  adding kakoune editor and enabling faac
  opera update qt, remove libxtc_dxtn
  fix
  .topmsg
  ffmpeg update
  ffmpeg: default to non git version, git version makes gst-ffmpeg fail
  ffmpeg with x11grab
  default to 0.10 version
  default to ffmpeg 0.10
  git version of ffmpeg
  backup tools bup, storeBackup: implement sanity check
  backup tools bup, storeBackup: implement sanity check
  merge problem fix
  adding store-backup
  adding sc
  update
  trying symlinks instead
  adding zimbu
  adding extundelete
  ...
Merge commit 'a7b65023c93564b3dd52ed59ad2a9b692068fa8a' into experimental/updates

* commit 'a7b65023c93564b3dd52ed59ad2a9b692068fa8a':