[jenkins/f21: 2/2] Merge branch 'master' into f21

[Michal Srb]

commit 58c1c6d0fc861f327a0bb8e17e02a0608e6a257d
Merge: 2861495 ecccdc8
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Feb 2 15:46:41 2015 +0100

    Merge branch 'master' into f21

 jenkins.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---