Merge branch 'next'
authorPeter Korsgaard <peter@korsgaard.com>
Wed, 2 Mar 2016 20:25:00 +0000 (21:25 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Wed, 2 Mar 2016 20:25:00 +0000 (21:25 +0100)
commit28cd1ed30aa4959c744ee37a6070cf22a66fb31f
treefe08f3fdff6fe458a3a21cf814f12ed6c7ba54e4
parent13222c07293becaefc69c46c8f90b04ddc7023d9
parent2dfabd10d1e484d84c0e6b5a58ab43d131ca3230
Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
12 files changed:
Config.in.legacy
package/avahi/avahi.mk
package/erlang-rebar/erlang-rebar.mk
package/linux-headers/Config.in.host
package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
package/nodejs/Config.in
package/nodejs/nodejs.hash
package/samba4/samba4.mk
package/systemd/systemd.mk
package/util-linux/Config.in
package/util-linux/util-linux.mk
package/xerces/xerces.mk