Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. ... Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix		2014-09-02 12:31:03 +02:00
..
0.6.90.nix
0.6.nix
0.10.nix
1.x.nix
2.x.nix	ffmpeg: update to 2.3.3	2014-08-29 13:05:09 +01:00