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

[Dave Brolley]

commit 9d0e87e0084e41087191ad566187a97744577cc9
Merge: a8c4f62 f068623
Author: Dave Brolley <brolley at redhat.com>
Date:   Fri Jan 23 22:21:35 2015 -0500

    Merge branch 'master' into f20

 pcp.spec |    4 ++--
 sources  |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
---