Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Thu, 21 Sep 2017 18:34:49 +0000 (20:34 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Thu, 21 Sep 2017 18:34:49 +0000 (20:34 +0200)
commitefa0ba499e78af732f302cbcd4002df6e259921e
tree90f57e970497e9a8e089b45d8305ce3ce0a7ceb6
parent595dcd48a965462ad45f19e42864ae972f34183d
parente2a95f8b16674ae2965bf155b6d28ca5942abb03
Merge branch 'master' into staging
gnu/local.mk
gnu/packages/emacs.scm
gnu/packages/gnome.scm
gnu/packages/machine-learning.scm