commit f551b21d189e2564c898563b09575825622dda24 Merge: bb36df8 cc9e1bf Author: Robert Scheck <robert at fedoraproject.org> Date: Wed Mar 5 19:48:56 2014 +0100 Merge remote branch 'origin/master' into el5 libburn.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---