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

[Mark Goodwin]

commit 621c804f29cf5805da8636ed788e2df46f8f1b26
Merge: 98fed02 d0f4a70
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Wed Jul 16 13:55:10 2014 +1000

    Merge branch 'master' into f20

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