[php-phpunit-phploc/f15: 7/7] Merge branch 'master' into f15

[Christof Damian]

commit f573d5be052f65eeff6e32d3437ed5c366032f2a
Merge: f47cf82 3bb5c18
Author: Christof Damian <christof at damian.net>
Date:   Sat Nov 5 14:19:19 2011 +0100

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	php-phpunit-phploc.spec
    	sources

 .gitignore              |    3 +--
 php-phpunit-phploc.spec |   18 +++++++++++++++---
 sources                 |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index fbf323b,f7ce74f..7898021
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--phploc-1.5.1.tgz
--/phploc-1.6.1.tgz
+ /phploc-1.6.2.tgz