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-03-28 18:52:37 -05:00
2014-08-24 22:31:37 +02:00
2013-10-17 18:35:24 +02:00
2014-08-14 16:10:30 +02:00
2014-01-13 17:05:45 +01:00
2012-03-01 22:03:34 +00:00
2014-01-13 17:05:45 +01:00
2014-08-24 22:31:37 +02:00
2014-08-30 22:52:46 +01:00
2013-05-17 23:48:22 +02:00