Merge branch 'master' into travis-exp

testdata/pacman.conf

@@ -0,0 +1,27 @@
+[options]
+RootDir     = /
+CacheDir    = /cachedir/ /another/
+LogFile     = /logfile
+GPGDir      = /gpgdir/
+HookDir     = /hookdir/
+UseDelta    = 0.5
+Architecture = 8086
+IgnorePkg   = ignore
+IgnorePkg   = this
+IgnorePkg   = package
+IgnoreGroup = ignore
+IgnoreGroup = this
+IgnoreGroup = group
+NoUpgrade   = noupgrade
+NoExtract   = noextract
+
+CheckSpace
+TotalDownload
+ILoveCandy
+VerbosePkgLists
+
+[repo1]
+Server = repo1
+
+[repo2]
+Server = repo2