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
..
2014-08-24 22:31:37 +02:00
2014-08-24 22:31:37 +02:00
2014-08-25 10:04:49 +02:00
2014-09-01 11:34:44 +02:00
2014-08-24 22:31:37 +02:00
2014-09-01 09:07:54 +04:00
2014-09-02 14:25:17 +04:00
2014-09-02 14:25:17 +04:00
2014-09-01 09:44:00 +02:00
2014-09-02 14:25:17 +04:00
2014-08-25 13:03:30 +02:00
2014-08-24 22:31:37 +02:00
2014-08-29 12:19:38 +01:00