Merge branch 'master' into core-updates Conflicts: gnu/packages/image.scm
gnu: Consolidate databases in (gnu packages databases). * gnu/packages/databases.scm: New file, with the contents of the following deleted files. * gnu/packages/mysql.scm, gnu/packages/postgresql.scm, gnu/packages/recutils.scm, gnu/packages/sqlite.scm, gnu/packages/bdb.scm: Remove. * gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/packages/apl.scm, gnu/packages/dc.scm, gnu/packages/games.scm, gnu/packages/gnunet.scm, gnu/packages/linux.scm, gnu/packages/mail.scm, gnu/packages/mpd.scm, gnu/packages/nvi.scm, gnu/packages/openldap.scm, gnu/packages/package-management.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/rdf.scm, gnu/packages/version-control.scm: Adjust to new module name.
Merge branch 'master' into core-updates
gnu: Add python-sphinx. * gnu/packages/python.scm (python-sphinx, python2-sphinx): New variables.
gnu: Add python-pygments. * gnu/packages/python.scm (python-pygments, python2-pygments): New variables.
gnu: Add python-docutils. * gnu/packages/python.scm (python-docutils, python2-docutils): New variables.
gnu: Add python-jinja2. * gnu/packages/python.scm (python-jinja2, python2-jinja2): New variables.
gnu: Add python-markupsafe. * gnu/packages/python.scm (python-markupsafe, python2-markupsafe): New variables.
gnu: Add python-virtualenv. * gnu/packages/python.scm (python-virtualenv, python2-virtualenv): New variables.
gnu: Add python-itsdangerous. * gnu/packages/python.scm (python-itsdangerous, python2-itsdangerous): New variables.
gnu: Add python-oauthlib. * gnu/packages/python.scm (python-oauthlib, python2-oauthlib): New variables.
gnu: Add python-pyjwt. * gnu/packages/python.scm (python-pyjwt, python2-pyjwt): New variables.
gnu: Add python-discover. * gnu/packages/python.scm (python-discover, python2-discover): New variables.
gnu: Add python-coverage. * gnu/packages/python.scm (python-coverage, python2-coverage): New variables.
gnu: Add python-testrepository. * gnu/packages/python.scm (python-testrepository, python2-testrepository): New variables.
gnu: Add python-fixtures. * gnu/packages/python.scm (python-fixtures, python2-fixtures): New variables.
gnu: Add python-subunit. * gnu/packages/python.scm (python-subunit, python2-subunit): New variables.
gnu: Add python-testresources. * gnu/packages/python.scm (python-testresources, python2-testresources): New variables.
gnu: Add python-testscenarios. * gnu/packages/python.scm (python-testscenarios, python2-testscenarios): New variables.
gnu: Add python-testtools. * gnu/packages/python.scm (python-testtools, python2-testtools): New variables.