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

[François Cami]

commit cd06b3c4324167070fd7a6e03a3961930fba55a5
Merge: e961304 c943825
Author: François Cami <fcami at fedoraproject.org>
Date:   Tue Jan 15 01:24:01 2013 +0100

    Merge branch 'master' into el6

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