Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/poppler/default.nix		2014-10-16 15:16:50 +02:00
..
3.10	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
3.12	Update gnome pomodoro using fetchFromGitHub	2014-10-13 11:02:56 +02:00