branch core-updates updated (a6d2b54d39 -> f2797f18c2)

[guix-commits]

podiki pushed a change to branch core-updates
in repository guix.

    from a6d2b54d39 gnu: Clean up merge errors.
     new aaf85222f1 gnu: python-pytest-localserver: Update to 0.7.1.
     new f2cc76c809 gnu: python-httplib2: Update to 0.22.0.
     new f2797f18c2 gnu: python-oauth2client: Fix build.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/check.scm      |  4 ++--
 gnu/packages/python-web.scm | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)