Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
..
2014-03-28 18:52:37 -05:00
2014-09-09 13:54:26 -07:00
2014-08-24 22:31:37 +02:00
2013-10-17 18:35:24 +02:00
2014-08-14 16:10:30 +02:00
2014-01-13 17:05:45 +01:00
2014-01-13 17:05:45 +01:00
2014-08-24 22:31:37 +02:00
2014-08-30 22:52:46 +01:00
2014-10-06 20:51:51 +02:00
2013-05-17 23:48:22 +02:00