Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
..
2014-10-15 01:02:03 +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
2013-10-05 19:36:23 +02:00
2014-01-09 13:01:38 +01:00
2014-10-05 23:38:16 +01:00
2014-08-22 11:57:40 +02:00
2014-02-05 19:18:33 +01:00
2014-01-11 19:08:40 +01:00
2013-06-04 11:30:32 +04:00
2014-02-03 18:32:21 -05:00
2014-10-14 17:39:24 +02:00
2014-08-29 01:14:10 +04:00
2012-12-13 15:53:24 +04:00
2014-10-07 16:23:28 +04:00
2014-08-24 22:31:37 +02:00
2014-10-07 16:06:20 +02:00
2014-09-24 13:42:17 +04:00
2014-08-19 23:47:58 +02:00
2014-10-10 17:07:16 +02: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
2013-01-28 17:19:01 +01:00
2014-10-15 10:57:08 +03: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-02 05:08:07 +02:00
2014-01-30 21:56:17 -06:00
2014-08-24 22:31:37 +02:00
2014-09-13 12:26:07 +02:00
2014-04-19 14:30:39 +01:00
2014-05-27 20:08:50 +02:00
2014-06-24 16:10:13 -05:00
2014-09-22 20:13:32 +01:00
2014-10-12 15:43:44 +01: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-10-13 15:36:49 +02:00
2014-09-04 14:41:35 +04:00
2014-09-11 13:32:33 +02:00
2014-04-13 19:46:00 +02:00
2014-07-22 11:01:32 +02:00
2014-08-24 22:31:37 +02:00
2014-04-19 23:21:51 +08:00
2014-10-10 22:43:58 +02:00