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-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