Merge branch 'master' into refs/top-bases/experimental/gutenprint

* master:
  silver-searcher: updated to 0.19.1
  ruby/patches.nix: sort attributes alphabetically
  pcsclite: Upgrade from 1.8.8 -> 1.8.10
  ccid: Update from 1.4.13 -> 1.4.14
  xmlindent: New expression
  Fix previous simutrans 112.3 build
  IntelliJ IDEA version bump (13.0.1->13.0.2)
  Add cython3 (python 3), move cython (python 2) to subfolder
  Update cython
  xpra: fix package name
  bcache-tools: new package
  python-dpkt: new package
  ilixi: new package
Merge commit 'refs/top-bases/experimental/gimp-git' into experimental/gimp-git

* commit 'refs/top-bases/experimental/gimp-git':
  silver-searcher: updated to 0.19.1
  ruby/patches.nix: sort attributes alphabetically
  pcsclite: Upgrade from 1.8.8 -> 1.8.10
  ccid: Update from 1.4.13 -> 1.4.14
  xmlindent: New expression
  Fix previous simutrans 112.3 build
  IntelliJ IDEA version bump (13.0.1->13.0.2)
  Add cython3 (python 3), move cython (python 2) to subfolder
  Update cython
  xpra: fix package name
  bcache-tools: new package
  python-dpkt: new package
  ilixi: new package
Merge branch 'experimental/gimp-git' into refs/top-bases/experimental/gutenprint

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

* commit 'refs/top-bases/experimental/gutenprint':
  silver-searcher: updated to 0.19.1
  ruby/patches.nix: sort attributes alphabetically
  pcsclite: Upgrade from 1.8.8 -> 1.8.10
  ccid: Update from 1.4.13 -> 1.4.14
  xmlindent: New expression
  Fix previous simutrans 112.3 build
  IntelliJ IDEA version bump (13.0.1->13.0.2)
  Add cython3 (python 3), move cython (python 2) to subfolder
  Update cython
  xpra: fix package name
  bcache-tools: new package
  python-dpkt: new package
  ilixi: new package
Merge commit 'f4e561bcfaf3ba1bb389a9117f7587071b56b2c2' into experimental/gimp-git

* commit 'f4e561bcfaf3ba1bb389a9117f7587071b56b2c2': (129 commits)
  bazaar: updated to 2.6.0 and fixed ssl bug
  nodejs: update packages
  Add pythonPackages.pysphere 0.1.8
  fontconfig: stop using xml:space; vital for nixos+2.11
  KDE-4.11: update to 4.11.5
  gphoto2: update from 2.5.2 to 2.5.3
  lm_sensors: update from 3.3.4 to 3.3.5
  exiv2: update from 0.23 to 0.24
  openldap: update from 2.4.35 to 2.4.38
  libassuan: update from 2.0.3 to 2.1.1
  nodejs: update packages
  idris-mode: fixed link to homepage (merge #1671)
  nodejs: fix the patch to make it build on darwin
  clarify rename error messages
  Updated node packages
  Force a rebuild.
  telepathy-farstream: Bump.
  mercurialFull: update from 2.8.2 to 2.9
  gcc 4.8: no need for the arm eabi patch.
  Updating tox/toxic
  ...
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/gutenprint' into refs/top-bases/experimental/gutenprint

* refs/remotes/gh/top-bases/experimental/gutenprint: (129 commits)
  bazaar: updated to 2.6.0 and fixed ssl bug
  nodejs: update packages
  Add pythonPackages.pysphere 0.1.8
  fontconfig: stop using xml:space; vital for nixos+2.11
  KDE-4.11: update to 4.11.5
  gphoto2: update from 2.5.2 to 2.5.3
  lm_sensors: update from 3.3.4 to 3.3.5
  exiv2: update from 0.23 to 0.24
  openldap: update from 2.4.35 to 2.4.38
  libassuan: update from 2.0.3 to 2.1.1
  nodejs: update packages
  idris-mode: fixed link to homepage (merge #1671)
  nodejs: fix the patch to make it build on darwin
  clarify rename error messages
  Updated node packages
  Force a rebuild.
  telepathy-farstream: Bump.
  mercurialFull: update from 2.8.2 to 2.9
  gcc 4.8: no need for the arm eabi patch.
  Updating tox/toxic
  ...
Merge branch 'experimental/gimp-git' into refs/top-bases/experimental/gutenprint

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

* refs/remotes/gh/experimental/gutenprint:
  temporary fix
  that code is no longer requirerd, drop example
  adding gutenprint 5.2.9
  making openjade compile by adding another patch
  follow upstream
  updates
  make gutenprint-cvs compile without internet access
  missing file
  opensp requires --enable-http flag to compile openjade - hard to finde
  gutenprint cvs compiles again
  New TopGit dependency: experimental/gimp-git
  suddenly it builds with current gcc ??
  initial
  new tg branch experimental/gutenprint
Merge commit 'bd86bc02a43d601579837320529d3bb2d1f9026d' into experimental/gutenprint

* commit 'bd86bc02a43d601579837320529d3bb2d1f9026d': (129 commits)
  bazaar: updated to 2.6.0 and fixed ssl bug
  nodejs: update packages
  Add pythonPackages.pysphere 0.1.8
  fontconfig: stop using xml:space; vital for nixos+2.11
  KDE-4.11: update to 4.11.5
  gphoto2: update from 2.5.2 to 2.5.3
  lm_sensors: update from 3.3.4 to 3.3.5
  exiv2: update from 0.23 to 0.24
  openldap: update from 2.4.35 to 2.4.38
  libassuan: update from 2.0.3 to 2.1.1
  nodejs: update packages
  idris-mode: fixed link to homepage (merge #1671)
  nodejs: fix the patch to make it build on darwin
  clarify rename error messages
  Updated node packages
  Force a rebuild.
  telepathy-farstream: Bump.
  mercurialFull: update from 2.8.2 to 2.9
  gcc 4.8: no need for the arm eabi patch.
  Updating tox/toxic
  ...