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-13 02:16:53 +02:00
2014-09-21 07:04:01 +01:00
2014-08-23 12:30:45 +04:00
2014-10-07 10:55:50 +02:00
2014-10-15 12:00:20 +02:00