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

[Christof Damian]

commit 75cf0152bcb307aef11687645bceb8f6bf41d378
Merge: cbe5194 9c68499
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 2 18:40:44 2012 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	php-pdepend-PHP-Depend.spec

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