Eelco Dolstra 929b7bdc4b Merge remote-tracking branch 'origin/master' into glibc-2.18 ... Conflicts: pkgs/development/libraries/glibc/2.17/locales.nix		2013-12-03 09:22:24 -05:00
..
2.18	Merge remote-tracking branch 'origin/master' into glibc-2.18	2013-12-03 09:22:24 -05:00