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
..
3.10	Merge recent master into staging	2014-08-30 10:04:02 +02:00
3.12	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00