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-09-11 20:35:56 +01:00
2014-06-23 12:33:10 +02:00
2014-09-20 02:15:42 -04:00
2014-08-24 22:31:37 +02:00
2014-10-05 23:38:16 +01:00
2014-08-22 11:57:40 +02:00
2014-08-29 01:14:10 +04:00
2014-08-11 13:58:40 +02:00
2014-08-20 02:03:18 -05:00
2014-08-24 22:31:37 +02:00
2014-09-24 13:42:17 +04:00
2014-09-09 13:54:24 -07:00
2014-09-28 01:35:49 +01:00
2014-06-01 15:15:15 +02:00
2014-09-21 17:20:59 -07:00
2014-08-24 22:31:37 +02:00
2014-08-24 22:31:37 +02:00
2014-08-20 01:43:31 -05:00
2014-08-24 16:02:57 +02:00
2014-08-24 22:31:37 +02:00
2014-09-13 12:26:07 +02:00
2014-05-27 20:08:50 +02:00
2014-06-24 16:10:13 -05:00
2014-09-22 12:35:07 +02:00
2014-08-24 22:31:37 +02:00
2014-08-24 22:31:37 +02:00
2014-09-04 14:41:35 +04:00
2014-09-11 13:32:33 +02:00
2014-07-22 11:01:32 +02:00
2014-08-24 22:31:37 +02:00
2014-05-21 15:50:15 +10:00