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

[sailer]

commit e77fc32ac5bbf35287550a28cdbae4625a7b6263
Merge: e79b024 615f943
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Tue Jan 15 17:11:58 2013 +0100

    Merge remote-tracking branch 'origin/master' into f18

 .gitignore  |    1 +
 sources     |    1 +
 vfrnav.spec |    5 ++++-
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc vfrnav.spec
index 997f505,04e9502..1532d04
--- a/vfrnav.spec
+++ b/vfrnav.spec
@@@ -191,8 -191,18 +191,11 @@@ rm -rf $RPM_BUILD_ROO
  %{_bindir}/vfrdbfasimport
  
  %changelog
+ * Tue Jan 15 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130113-1
+ - update to 20130113
+ 
  * Thu Jan 10 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20130110-1
  - update to 20130110
 -- rebuild for polyclipping
 -
 -* Sat Dec 29 2012 Dan Horák <dan[at]danny.cz> - 20121212-3
 -- update BR for s390(x)
 -
 -* Thu Dec 27 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20121212-2
 -- rebuild for polyclipping 4.10.0
  
  * Sun Dec 16 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 20121212-1
  - update to 20121212