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-09-24 21:48:55 +01:00
2014-07-30 16:19:26 +02:00
2014-08-29 18:43:03 +02:00
2014-02-08 14:59:52 +01:00
2014-10-10 17:18:04 +02:00
2014-08-18 17:14:43 +02:00
2014-07-30 16:19:26 +02:00
2014-07-30 16:19:26 +02:00