[php-pdepend-PHP-Depend: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-pdepend-PHP-Depend

[Christof Damian]

commit 9c6849986262927927dcea89a578273537bf8a20
Merge: 43d447a 845a0fd
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 2 18:32:16 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-pdepend-PHP-Depend
    
    Conflicts:
    	php-pdepend-PHP-Depend.spec

 php-pdepend-PHP-Depend.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc php-pdepend-PHP-Depend.spec
index 5c870c6,aa31de3..f7e5114
--- a/php-pdepend-PHP-Depend.spec
+++ b/php-pdepend-PHP-Depend.spec
@@@ -76,15 -76,11 +76,18 @@@ f
  %{pear_xmldir}/%{name}.xml
  %{pear_phpdir}/PHP
  %{_bindir}/pdepend
 +%doc %{pear_docdir}/%{pear_name}
  
  %changelog
 +* Fri Mar  2 2012 Christof Damian <christof at damian.net> - 1.0.4-1
 +- upstream 1.0.4
 +
 +* Thu Feb  9 2012 Christof Damian <christof at damian.net> - 1.0.1-1
 +- upstream 1.0.1
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.6-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sun Oct 30 2011 Christof Damian <christof at damian.net> - 0.10.6-1
  - upstream 0.10.6