Merge branch 'master' into core-updates
Conflicts:
Makefile.am
gnu/packages/base.scm
build: Bump to version 0.2.
* configure.ac: Bump version number.
Merge branch 'nix-integration'
Conflicts:
tests/guix-package.sh
daemon: Use `openssl' from $PATH.
* daemon.am (-DOPENSSL_PATH): Default to "openssl".
* TODO: Mention removal of OpenSSL dependency.
Merge branch 'master' into nix-integration
Conflicts:
guix/store.scm
Merge branch 'master' into nix-integration
doc: Add `TODO'.
* TODO: New file.
* Makefile.am (EXTRA_DIST): Add it.