40b9524
Merge remote branch 'origin/f13/master' Conflicts: .gitignore orc.spec sources Signed-off-by: Fabian Deutsch <fabian.deutsch@gmx.de>