commit f20461574bbae28d12eaaecfebaa2a06502674f6 Merge: e84ddab fc64eee Author: Michael Schwendt <mschwendt at fedoraproject.org> Date: Sat Feb 21 14:25:14 2015 +0100 Merge branch 'master' into f22 ---