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

[Patrick Uiterwijk]

commit b9808b305b0b1a622131ca75a5b46d7fac489d9c
Merge: 1345d1c 3481f09
Author: Patrick Uiterwijk <puiterwijk at redhat.com>
Date:   Tue Apr 15 08:40:45 2014 -0400

    Merge branch 'master' into f20

 cockpit.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---