[jacoco/f21: 3/3] Merge remote-tracking branch 'origin/master' into f21

[Alexander Kurtakov]

commit 9499744c424a789c9bccf7d7d1a0a983fb059ad3
Merge: ec8699e 5eeef86
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Feb 16 13:52:52 2015 +0200

    Merge remote-tracking branch 'origin/master' into f21
    
    Conflicts:
    	jacoco.spec

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