[php-pecl-mongo: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-pecl-mongo

[Christof Damian]

commit a2bac32e4ef7d80d6e8661450130bba68079dada
Merge: b26ee4d 14c32e2
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 16:54:46 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-pecl-mongo
    
    Conflicts:
    	.gitignore
    	php-pecl-mongo.spec
    	sources

 .gitignore          |    2 --
 php-pecl-mongo.spec |   17 +++++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 67b17af,499b4ed..7818e17
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,1 @@@
--/mongo-1.0.10.tgz
--/mongo-1.2.1.tgz
 -/mongo-1.2.7.tgz
 +/mongo-1.2.9.tgz
diff --cc php-pecl-mongo.spec
index 899e2f7,42383cc..4baf536
--- a/php-pecl-mongo.spec
+++ b/php-pecl-mongo.spec
@@@ -140,9 -142,13 +142,16 @@@ cd %{pecl_name}-%{version
  
  
  %changelog
 +* Sat Mar  3 2012 Christof Damian <christof at damian.net> - 1.2.9-1
 +- upstream 1.2.9
 +
+ * Thu Jan 19 2012 Remi Collet <remi at fedoraproject.org> - 1.2.7-1
+ - update to 1.2.7 for php 5.4
+ - fix filters
+ 
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sun Jul 17 2011 Christof Damian <christof at damian.net> - 1.2.1-1
  - upstream 1.2.1