Frederik Rietdijk cb2de9354f Merge pull request #19932 from igsha/passlib ... pythonPackages.passlib: 1.6.2 -> 1.6.5		2016-10-28 12:49:07 +02:00
..
applications	docker: 1.12.2 -> 1.12.3	2016-10-27 12:46:04 -04:00
build-support	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-26 13:06:43 +02:00
data	Merge pull request #19845 from NeQuissimus/unifont_9_0_03	2016-10-25 11:48:27 -04:00
desktops	Merge pull request #19917 from grahamc/epiphany	2016-10-27 12:09:48 -04:00
development	haskellPackages.hakyll: Fix the Darwin build (broken tests)	2016-10-27 15:10:39 -07:00
games	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-26 13:06:43 +02:00
misc	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-26 13:06:43 +02:00
os-specific	Merge pull request #19903 from carlsverre/update/sysdig	2016-10-27 14:10:39 -04:00
servers	Merge pull request #19888 from Mic92/influxdb	2016-10-27 11:43:27 +02:00
shells	oh-my-zsh: 2016-10-08 -> 2016-10-25	2016-10-25 14:29:36 -04:00
stdenv	Merge remote-tracking branch 'upstream/master' into HEAD	2016-10-26 13:06:43 +02:00
test
tools	Merge pull request #19921 from reinhardt/fix/duplicity-dependencies	2016-10-27 16:30:59 +02:00
top-level	Merge pull request #19932 from igsha/passlib	2016-10-28 12:49:07 +02:00