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

[Patrick Uiterwijk]

commit 0a288322ec8b19f025c166cacb83ce55557e0fdf
Merge: d3e6196 473df9b
Author: Patrick Uiterwijk <puiterwijk at redhat.com>
Date:   Thu Apr 3 17:18:23 2014 -0400

    Merge branch 'master' into f20

 cockpit.spec |   24 +++++++++++++-----------
 sources      |    3 ++-
 2 files changed, 15 insertions(+), 12 deletions(-)
---