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

[François Cami]

commit ecaa9e543c50a6c25a04e14ea9710b44ddde4a66
Merge: 9b1ef0c c943825
Author: François Cami <fcami at fedoraproject.org>
Date:   Tue Jan 15 01:25:00 2013 +0100

    Merge branch 'master' into el5

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