[cppcheck/el6: 2/2] Merge branch 'master' into el6

[Susi Lehtola]

commit 027c907363dbd25e0989291a6355d437f3034e84
Merge: d5e69cb e8ede0a
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Jan 7 18:32:46 2014 +0200

    Merge branch 'master' into el6

 .gitignore    |    1 +
 cppcheck.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---