Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Fri, 6 Oct 2017 09:03:27 +0000 (11:03 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Fri, 6 Oct 2017 09:03:27 +0000 (11:03 +0200)
commit6a317919cf0f9dbc651a4a41f9ed99c49bf2d543
tree9454b6c587b75ee1e3625be64f39cc39a5154db6
parent68932812b8f6581dda4bf1896235492f687b7cc9
parent8bde6a524e19d2bc9763b84dbf99959faf653bf8
Merge branch 'master' into staging
gnu/local.mk
gnu/packages/curl.scm
gnu/packages/gnome.scm
gnu/packages/maths.scm
gnu/packages/python.scm
gnu/packages/tor.scm