[turpial: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/turpial

[Edwind Richzendy Contreras Soto]

commit 302834085616b2c10aa0ef84b42183c418394234
Merge: e3d27d7 3f2d484
Author: Edwind Contreras <Richzendy at gmail.com>
Date:   Sat Mar 31 10:27:57 2012 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/turpial
    
    Conflicts:
    	turpial.spec

 turpial.spec |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --cc turpial.spec
index 38c3348,71ce921..1393947
--- a/turpial.spec
+++ b/turpial.spec
@@@ -5,8 -5,8 +5,13 @@@
  %endif
  
  Name:           turpial
++<<<<<<< HEAD
 +Version:        1.6.9
 +Release:        1%{?dist}
++=======
+ Version:        1.6.6
+ Release:        4%{?dist}
++>>>>>>> 3f2d4848ae7f215707054d7abd2582be65139c23
  Summary:        Cool twitter client with many features and very light
  Group:          Applications/Internet
  License:        GPLv3
@@@ -52,8 -52,8 +57,13 @@@ rm -rf %{buildroot
  %{_mandir}/man1/%{name}.1.gz
  
  %changelog
++<<<<<<< HEAD
 +* Thu Mar 22 2012 Richzendy <richzendy at fedoraproject.org> - 1.6.9-1
 +- New stable release, url to source code updated
++=======
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.6-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
++>>>>>>> 3f2d4848ae7f215707054d7abd2582be65139c23
  
  * Fri Dec 02 2011 Richzendy <richzendy at fedoraproject.org> - 1.6.6-3
  - Fix to bug 758979, 758992 in bugzilla