[php-phpunit-phpcpd/el6/master: 9/9] Merge branch 'master' into el6

[Christof Damian]

commit c278c3848f2fc23be6c80f5916ebb3ce77653510
Merge: 2801cdb 89b4f73
Author: Christof Damian <christof at damian.net>
Date:   Tue Oct 19 21:04:57 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	php-phpunit-phpcpd.spec
    	sources

 .gitignore              |    2 +-
 php-phpunit-phpcpd.spec |   10 ++++++++--
 sources                 |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 83904af,5979979..19367ad
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--phpcpd-1.3.1.tgz
+ /phpcpd-1.3.2.tgz