Domen Kožar 4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
..
2014-07-02 12:12:57 +02:00
2014-07-02 12:12:57 +02:00
2014-11-25 00:53:06 +01:00
2014-12-07 14:02:48 +01:00
2014-10-10 17:07:16 +02:00
2013-12-23 09:43:19 +01:00
2014-07-22 11:01:32 +02:00