Vladimír Čunát 08dd527cc7 Merge branch 'staging' ... http://hydra.nixos.org/eval/1234895 The mass errors on Hydra seem transient; I verified ghc on i686-linux. Only darwin jobs are queued ATM. There's a libpng security update included in this merge, so I don't want to wait too long.		2015-12-29 17:14:35 +01:00
..
darwin	adv_cmds: fix typo in file name	2015-12-13 12:02:42 -08:00
gnu	samba: Revert style changes and get rid of some dependencies	2015-06-01 15:35:59 +02:00
linux	Merge branch 'staging'	2015-12-29 17:14:35 +01:00
windows	libgcrypt: Massive cleanup and make 1.6 the default	2015-05-01 17:41:42 -07:00