[cockpit/f20: 5/5] Merge branch 'master' into f20

[Stef Walter]

commit 8ffe949e96d4145d4a565b063676363fd69918b6
Merge: b9808b3 b80b674
Author: Stef Walter <stefw at redhat.com>
Date:   Wed May 21 15:50:18 2014 +0200

    Merge branch 'master' into f20

 cockpit.spec |   31 +++++++++++++++++++------------
 sources      |    2 +-
 2 files changed, 20 insertions(+), 13 deletions(-)
---