Thomas Strobel 6366509e54 Merge branch 'upstream' into pam_mount ... Conflicts: pkgs/top-level/all-packages.nix		2014-09-15 12:15:11 +02:00
..
applications	Merge pull request #4079 from ambrop72/virtualbox-alsa	2014-09-14 22:27:10 +02:00
build-support	build-fhs-chrootenv: bind mount chroots /tmp to hosts /tmp	2014-09-09 12:10:54 +02:00
data	Merge pull request #4060 from rycee/stix-font	2014-09-13 15:56:56 +02:00
desktops	Merge pull request #4010 from madjar/master	2014-09-10 10:10:36 +02:00
development	Merge branch 'upstream' into pam_mount	2014-09-15 12:15:11 +02:00
games	transformed meta.maintainers of some packages into lists	2014-09-13 13:52:02 +02:00
misc	transformed meta.maintainers of some packages into lists	2014-09-13 13:52:02 +02:00
os-specific	Merge branch 'upstream' into pam_mount	2014-09-15 12:15:11 +02:00
servers	mod-wsgi: update from 3.4 to 3.5, fixes CVE-2014-0240	2014-09-13 20:32:26 +02:00
shells
stdenv	Revert "stdenv/setup.sh: unbreak *.lz sources on darwin"	2014-08-30 22:41:56 +02:00
test	s/dependancy/dependency/	2014-09-10 00:28:49 +01:00
tools	radvd: 2.5 -> 2.6	2014-09-15 01:30:42 -07:00
top-level	Merge branch 'upstream' into pam_mount	2014-09-15 12:15:11 +02:00