[kcachegrind/f20: 9/9] Merge branch 'master' into f20

[Rex Dieter]

commit 8c4eb311ea3ea583682fc6ca3d17b5c26355d055
Merge: e4effcc 65f7807
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:35:45 2014 -0600

    Merge branch 'master' into f20

 .gitignore       |    6 ++++++
 kcachegrind.spec |   20 +++++++++++++++++++-
 sources          |    2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
---