Peter Simons 9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
..
2013-07-25 10:11:19 +02:00
2013-06-07 11:18:33 +02:00
2013-03-26 22:52:54 +08:00
2013-06-04 11:30:32 +04:00
2013-03-19 13:59:40 -04:00
2012-12-13 15:53:24 +04:00
2013-09-21 09:51:35 +02:00
2013-01-28 18:31:17 +01:00
2013-01-28 17:19:01 +01:00
2013-03-11 10:47:21 +01:00
2013-06-11 15:44:56 +04:00
2013-07-01 15:39:39 +02:00
2013-09-02 15:45:29 +02:00
2013-01-28 18:31:17 +01:00
2013-07-08 10:48:05 +02:00
2012-10-04 19:53:10 -04:00
2013-08-11 17:13:46 +02:00
2013-05-10 14:41:29 +02:00
2013-06-04 11:30:26 +04:00
2013-05-21 09:20:00 +02:00
2013-08-16 23:45:01 +02:00
2013-08-16 23:45:01 +02:00
2013-09-07 00:36:40 +04:00
2013-05-12 22:46:41 +02:00