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

[Theodore Lee]

commit 9889c4aa76709a65b60a6779fdda2abc0e2ff607
Merge: 3ae8443 31016b8
Author: Theodore Lee <theo148 at gmail.com>
Date:   Fri Apr 20 15:18:25 2012 +0800

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

 php-pecl-yaml.spec |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --cc php-pecl-yaml.spec
index b4f525d,4e07859..dd6f91d
--- a/php-pecl-yaml.spec
+++ b/php-pecl-yaml.spec
@@@ -106,10 -112,13 +108,17 @@@ f
  
  
  %changelog
 +* Fri Apr 20 2012 Theodore Lee <theo148 at gmail.com> - 1.1.0-1
 +- Update to upstream 1.1.0 release
 +- Drop upstreamed cflags patch
 +
+ * Thu Jan 19 2012 Remi Collet <remi at fedoraproject.org> - 1.0.1-6
+ - build against php 5.4
+ - fix filters
+ 
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Fri May 13 2011 Theodore Lee <theo148 at gmail.com> - 1.0.1-4
  - Fix commenting in module configuration