[php-phpmd-PHP-PMD/el6/master: 8/8] Merge branch 'master' into el6

[Christof Damian]

commit 8d3062173d2a80c62018d20ed8adf56c35cf8f58
Merge: 521d9e1 d90db97
Author: Christof Damian <christof at damian.net>
Date:   Sat Oct 2 13:18:01 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	php-phpmd-PHP-PMD.spec
    	sources

 .gitignore             |    2 +-
 php-phpmd-PHP-PMD.spec |    5 ++++-
 sources                |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index b7ee47e,e25524f..5ecd7b4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--PHP_PMD-0.2.6.tgz
+ /PHP_PMD-0.2.7.tgz