fe620ac
Merge branch 'master' into f16 Conflicts: .gitignore dokuwiki-rm-bundled-libs.patch dokuwiki.spec sources