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-04-18 00:45:26 +02:00
2014-10-07 21:46:15 +02:00
2014-08-31 21:39:03 +02:00
2014-05-06 20:04:22 +02:00