Merge branch 'master' into hvm

2012-08-06 15:00:02 +02:00 · 2012-08-06 15:00:02 +02:00 · 2dda902bdd
--- a/network/filter-qubes-yum
+++ b/network/filter-qubes-yum
@ -1,4 +1,4 @@
-.*/repodata/[A-Za-z0-9-]*\(primary\|filelist\|comps\(-[a-z0-9]*\)\?\|other\|prestodelta\|updateinfo\)\.\(sqlite\|xml\)\(\.bz2\|\.gz\)\?$
+.*/repodata/[A-Za-z0-9-]*\(primary\|filelists\|comps\(-[a-z0-9]*\)\?\|other\|prestodelta\|updateinfo\)\.\(sqlite\|xml\)\(\.bz2\|\.gz\)\?$
 .*/repodata/repomd\.xml$
 .*\.rpm$
 .*\.drpm$