Vladimír Čunát 7af694700c Merge branch 'master' into x-updates ... Silently merged badly the firefox 20/21 things. I got that, hopefully there aren't more (my nixos-rebuild dry-run finds no more errors).		2013-06-05 12:59:47 +02:00
..
4.8	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00