commit f0421dec97b0e12afd44cb330dc1b8a4f7abb915 Merge: f551b21 71d87a1 Author: Robert Scheck <robert at fedoraproject.org> Date: Sun Jun 29 19:24:25 2014 +0200 Merge remote branch 'origin/master' into el5 libburn.spec | 8 +++++++- sources | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) ---