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-14 11:43:51 +02:00
2014-09-06 22:54:15 +02:00
2014-09-03 21:23:30 +02:00
2014-08-01 15:25:50 +02:00
2014-09-02 01:48:50 +04:00