commit 13290f5de9e2185574f01dd5f02e8e1ccda3d6bd Merge: da530f7 583eba7 Author: Christof Damian <christof at damian.net> Date: Fri Mar 2 19:57:30 2012 +0100 Merge branch 'master' into el6 .gitignore | 1 + php-phpmd-PHP-PMD.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---