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

[Michal Srb]

commit 002535bed542eb30ec2bde23de47fc760827abe7
Merge: e515ecf b7431e6
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Oct 14 09:51:44 2014 +0200

    Merge branch 'master' into f21

 add-support-for-plugins-from-RPMs.patch |  270 +++++++++++++++++++++++++++---
 do-not-check-for-core-updates.patch     |   13 ++
 jenkins.init                            |    2 +-
 jenkins.spec                            |   57 +++++--
 4 files changed, 297 insertions(+), 45 deletions(-)
---