Merge branch 'master' into core-updates
authorLeo Famulari <leo@famulari.name>
Mon, 13 Jun 2016 02:02:04 +0000 (22:02 -0400)
committerLeo Famulari <leo@famulari.name>
Mon, 13 Jun 2016 02:09:26 +0000 (22:09 -0400)
commitee86e7e14859533045e1f7727ae731ba6ba72daf
treea5f51a9c4859a3242b46876797b98e77a5a7506e
parent8af5cac527eee03005f3809578a0d8258a878f95
parentfe585be9aa8f5158a7dfb6477d19ece3d643dec3
Merge branch 'master' into core-updates
12 files changed:
gnu/local.mk
gnu/packages/check.scm
gnu/packages/databases.scm
gnu/packages/emacs.scm
gnu/packages/fonts.scm
gnu/packages/guile.scm
gnu/packages/linux.scm
gnu/packages/patches/expat-CVE-2015-1283-refix.patch
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/video.scm
gnu/packages/xml.scm