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-15 02:16:04 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-08-10 14:51:23 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-04-14 21:03:43 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-07-01 16:28:34 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00