Charles Strahan a188373640 Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs
Conflicts:
	pkgs/development/libraries/haskell/ghcjs-dom/default.nix
	pkgs/top-level/haskell-packages.nix
2014-12-27 14:35:01 -05:00
..
2014-12-13 12:06:02 +01:00
2014-12-13 12:53:42 +01:00
2014-11-26 15:49:16 -05:00
2014-12-25 11:05:49 +01:00
2014-12-10 09:42:03 +00:00
2014-11-24 16:24:07 +01:00
2014-12-02 01:12:05 +03:00
2014-11-16 00:57:50 -06:00
2014-11-17 01:08:11 -05:00
2014-12-27 14:27:37 -05:00
2014-12-10 09:42:03 +00:00
2014-12-10 09:48:27 +00:00
2014-11-19 16:53:43 +03:00
2014-11-28 23:11:39 +01:00
2014-12-13 12:06:07 +01:00
2014-12-10 09:49:15 +00:00
2014-11-29 23:07:02 +05:30
2014-11-14 14:13:40 +01:00
2014-12-13 12:06:09 +01:00
2014-11-28 15:25:49 -05:00
2014-12-06 18:24:30 +03:00
2014-12-13 12:06:01 +01:00
2014-12-04 20:16:09 +01:00
2014-12-05 14:25:50 +01:00
2014-12-13 12:06:11 +01:00
2014-11-08 11:47:05 +01:00
2014-11-24 16:24:07 +01:00
2014-12-13 12:06:13 +01:00
2014-12-13 15:17:26 +01:00
2014-12-13 12:06:16 +01:00
2014-12-10 09:48:37 +00:00