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-30 10:29:50 +01:00
2014-10-07 01:00:37 +04:00
2014-08-24 22:31:37 +02:00
2012-07-27 19:27:25 -04:00
2014-10-09 09:43:33 +02:00