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

[nathans]

commit f9c4df9eaa7ca7aa8dc613713f6ae1c0d1e9d15c
Merge: 8895386 d4f2f19
Author: Nathan Scott <nathans at redhat.com>
Date:   Mon Dec 1 15:29:03 2014 +1100

    Merge branch 'master' into f20

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