[configs/alternative] Add ILoveCandy to root-image/etc/pacman.conf
Merge branch 'master' into l10n-zh
[configs/alternative] Add cowsay to packages.both
[configs/alternative] Add ccache to packages.both

See also: ArchWiki:Ccache
[configs/alternative] Add clisp to packages.both
[configs/alternative] Add tcc to packages.both
[configs/alternative] Add nasm,yasm to packages.both
[configs/alternative] Add iozone to packages.backport

 * iozone: A filesystem benchmark tool
[configs/alternative] Add kexec userspace tools to package list

Add kexec-tools to packages.both
[configs/alternative] Bug fix
Merge branch 'master' into l10n-zh
[configs/alternative] Add lighttpd,dhcp to package list

Add lighttpd to packages.both
Add dhcp to packages.both
[configs/alternative] Bug fix

* Fix a bug
* Add user "arch" to vboxsf,bumblebee,wireshark,uucp,kismet group
Merge branch 'master' into l10n-zh
[configs/alternative] Generate locales for l10n-zh support

This was forgotten in 7409d260da3e06450c444d839c778de195c06839
[configs/alternative] Typo fix
Merge branch 'master' into l10n-zh