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

[mattia]

commit 8d341a9ff29a363eb554c018dc47fa272786de2d
Merge: fa29caa dc48b5e
Author: Mattia Verga <mattia.verga at tiscali.it>
Date:   Sun Mar 10 09:37:52 2013 +0100

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

 skychart.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc skychart.spec
index 02c26ff,e1f0880..1fa79f4
--- a/skychart.spec
+++ b/skychart.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name: skychart
  Version: 3.7
--Release: 0.2.%{svnversion}svn%{?dist}
++Release: 0.3.%{svnversion}svn%{?dist}
  Summary: Planetarium software for the advanced amateur astronomer
  
  Group: Amusements/Graphics
@@@ -143,9 -143,9 +143,12 @@@ f
  
  
  %changelog
- * Sun Mar 10 2013 Mattia Verga <mattia.verga at tiscali.it> - 3.7-0.2.2268svn
++* Sun Mar 10 2013 Mattia Verga <mattia.verga at tiscali.it> - 3.7-0.3.2268svn
 +- Exclude armv7hl architecture
 +
+ * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7-0.2.2268svn
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Sat Oct 06 2012 Mattia Verga <mattia.verga at tiscali.it> - 3.7-0.1.2268svn
  - Update to 3.7 testing version