Merge remote-tracking branch 'upstream/master' into ocaml-sqlite3EZ (7d3706c7) · Commits · jan / nixpkgs

Commit 7d3706c7 authored Sep 02, 2014 by

Vincent Laporte

Conflicts:
	pkgs/top-level/all-packages.nix

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment