gitignore kate files
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
kate undone
Added support for /etc/portage/package.* config files

I've to report an abuse of language in my code:
I've used the word "flag" to refer to everything which follows
the DEPEND atom in those files. This is not correct, they have
different names, but I needed a common word.
apt: fix pkg.latest_version

If a particular package name is both the name of a package and also the
name of a virtual package, the version comparison used to determine if
the install candidate is an upgrade fails. This commit fixes #5455 by
stripping the virtual package markers from the package list returned by
list_pkgs().
Merge pull request #5472 from terminalmage/issue5455

apt: fix pkg.latest_version
Merge pull request #5473 from terminalmage/quickfix

Switch to pkg.compare for version comparison
Fix function typo
Merge pull request #5474 from UtahDave/develop

Fix function typo
Make the pillar.data docstring make a little more sense
Fix module name typo
Merge pull request #5475 from UtahDave/develop

Fix module name typo
Refix module name typo is salt.utils.is_windows
Merge pull request #5476 from UtahDave/develop

Refix module name typo is salt.utils.is_windows
use locale.get_encoding
add newline for clarity
copyedit states/layers.rst
Merge pull request #5477 from cvrebert/copyedit

copyedit states/layers.rst