[php-pdepend-PHP-Depend/el6: 3/3] Merge branch 'master' into el6

[Christof Damian]

commit 2dad434bfd6c071b2285b02e652d902a68f4b485
Merge: 084c5fa d21b2ee
Author: Christof Damian <christof at damian.net>
Date:   Sun Oct 30 19:00:27 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                  |    8 +-------
 php-pdepend-PHP-Depend.spec |    5 ++++-
 sources                     |    2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)
---