[php-swift-Swift: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-swift-Swift

[Christof Damian]

commit da892f5d77ef2ce917484a6c10aeee318b2f43a4
Merge: c4526c5 a0e575e
Author: Christof Damian <christof at damian.net>
Date:   Tue Oct 30 20:10:48 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-swift-Swift
    
    Conflicts:
    	php-swift-Swift.spec

 php-swift-Swift.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc php-swift-Swift.spec
index 5b9ea4c,7025d35..ccb41a8
--- a/php-swift-Swift.spec
+++ b/php-swift-Swift.spec
@@@ -85,9 -85,9 +85,12 @@@ f
  %{pear_phpdir}/%{pear_name}
  
  %changelog
 +* Tue Oct 30 2012 Christof Damian <christof at damian.net> - 4.2.2-1
 +- upstream 4.2.2
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Fri Jul 13 2012 Christof Damian <christof at damian.net> - 4.2.1-1
  - upstream 4.2.1