Merge branch 'master' into core-updates
authorMark H Weaver <mhw@netris.org>
Sun, 18 Jun 2017 06:36:51 +0000 (02:36 -0400)
committerMark H Weaver <mhw@netris.org>
Sun, 18 Jun 2017 06:36:51 +0000 (02:36 -0400)
commit9d4385634d098cc0fb35bfe58179f7d855352e39
tree653cfd7a6faecaf42129b1aa47703e7bd01bc471
parenta6aff3528c32cc921bddd78b254678a1fc121f21
parent96fd87c96bd6987a967575aaa931c5a7b1c84e21
Merge branch 'master' into core-updates
12 files changed:
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/backup.scm
gnu/packages/curl.scm
gnu/packages/databases.scm
gnu/packages/embedded.scm
gnu/packages/gnome.scm
gnu/packages/image.scm
gnu/packages/linux.scm
gnu/packages/python.scm
gnu/packages/web.scm
guix/packages.scm