[vfrnav/f19: 12/13] Merge remote-tracking branch 'origin/f20' into f19

[sailer]

commit cfa021600732e6fcf1a498ac08975b6b2ca81886
Merge: 207d422 f771cf0
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Thu Nov 28 00:33:16 2013 +0100

    Merge remote-tracking branch 'origin/f20' into f19

 .gitignore          |   25 ++-----------------------
 sources             |    2 +-
 vfrnav-webkit.patch |   22 ++++++++++++++++++++++
 vfrnav.spec         |   38 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 62 insertions(+), 25 deletions(-)
---
diff --cc vfrnav.spec
index 700bf31,9d031cc..8ca68b7
--- a/vfrnav.spec
+++ b/vfrnav.spec
@@@ -284,8 -314,15 +314,14 @@@ rm -rf $RPM_BUILD_ROO
  %endif
  
  %changelog
+ * Wed Nov 27 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20131127-1
+ - update to 20131127
+ 
+ * Mon Sep 23 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130920-1
+ - update to 20130920
+ 
  * Thu Aug 29 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130829-1
  - update to 20130829
 -- rebuild for gdal
  
  * Thu Aug  1 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130801-1
  - update to 20130801