Merge branch 'next'

Conflicts:
	package/e2fsprogs/e2fsprogs.mk
	package/libfuse/libfuse.mk
	package/multimedia/mpd/mpd.mk
	package/smartmontools/smartmontools.mk

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard
2012-09-03 21:33:25 +02:00
84 changed files with 2518 additions and 442 deletions

View File

@@ -4,7 +4,7 @@
#
#############################################################
SUDO_VERSION = 1.8.5p1
SUDO_VERSION = 1.8.5p2
SUDO_SITE = http://www.sudo.ws/sudo/dist
SUDO_CONF_OPT = \
--without-lecture \