commit 3eac946ff9f518f8c23889c56dc88d859f907058 Merge: cb8f994 a101dab Author: Christof Damian <christof at damian.net> Date: Fri Jul 15 21:04:56 2011 +0200 Merge branch 'master' into el6 .gitignore | 2 ++ php-phpmd-PHP-PMD.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) ---