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

[Susi Lehtola]

commit 7502742ede8699038b928009bc8ce002c3920221
Merge: a1c90b7 e8ede0a
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Jan 7 18:36:50 2014 +0200

    Merge branch 'master' into el5

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