Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f82be3

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
..
2014-11-05 12:12:30 +01: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