[Git][pacman/pacman][master] 2 commits: conf: make prepend_dir and globdir NULL aware