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

[Sergio Pascual]

commit 441307347de2ce4243536e7156d1f74ab385237c
Merge: 115af30 13d147b
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri Jan 20 00:36:12 2012 +0100

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

 skychart.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc skychart.spec
index 6629d48,2d8a2dc..f787199
--- a/skychart.spec
+++ b/skychart.spec
@@@ -103,10 -102,9 +103,13 @@@ desktop-file-validate %{buildroot}%{_da
  
  
  %changelog
- * Tue May 03 2011 Dan Horák <dan[at]danny.cz> - 3.4-1
++* Thu Jan 19 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.4-1
 +- New upstream source
 +- New source with ephemeris
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Tue May 03 2011 Dan Horák <dan[at]danny.cz> - 3.2-5
  - no lazarus on s390(x)