[vfrnav/f18: 4/4] Merge remote-tracking branch 'origin/master' into f18

[sailer]

commit 6004238f1d50abde4b8ca21aa0f67266ed2a966f
Merge: 20473ec 8c7dfce
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Tue Apr 30 04:16:40 2013 +0200

    Merge remote-tracking branch 'origin/master' into f18
    
    Conflicts:
    	vfrnav.spec

 .gitignore  |    1 +
 sources     |    2 +-
 vfrnav.spec |   11 ++++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --cc vfrnav.spec
index 109ef3a,f987e10..3b3278c
--- a/vfrnav.spec
+++ b/vfrnav.spec
@@@ -199,11 -197,17 +197,14 @@@ rm -rf $RPM_BUILD_ROO
  %{_bindir}/vfrdbfasimport
  
  %changelog
+ * Mon Apr 29 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130429-1
+ - update to 20130429
+ 
  * Sun Mar 10 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130303-1
 -- update and rebuild for geos
 +- update
  
 -* Mon Mar  4 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130123-2
 -- rebuild for polyclipping
 -
 -* Sat Jan 26 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130123-1
 -- rebuild for geos
 +* Fri Jan 18 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130113-1.1
 +- rebuild for polyclipping 5.0.3
  
  * Tue Jan 15 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130113-1
  - update to 20130113