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

[Dave Brolley]

commit 6144eea0af7a48bc2d06b5e9bf43a5311b4394c4
Merge: 9d0e87e 3f4a5db
Author: Dave Brolley <brolley at redhat.com>
Date:   Mon Jan 26 12:32:00 2015 -0500

    Merge branch 'master' into f20

 pcp.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---