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

[sailer]

commit f771cf0b826d1b5a37332324f24fdeb3d2e3e2f4
Merge: 280249a 85cd8d7
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Thu Nov 28 00:27:00 2013 +0100

    Merge remote-tracking branch 'origin/master' into f20
    
    Conflicts:
    	.gitignore

 .gitignore  |    1 +
 sources     |    2 +-
 vfrnav.spec |   13 ++++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 9129de1,6b1c7b4..bd2e844
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,25 +1,2 @@@
 -vfrnav-0.3.tar.gz
 -vfrnav-0.4.tar.gz
 -/vfrnav-0.5.tar.gz
 -/vfrnav-0.6.tar.gz
 -/vfrnav-0.7.tar.gz
 -/vfrnav-0.8.tar.gz
 -/vfrnav-0.9.tar.gz
 -/vfrnav-20120801.tar.gz
 -/vfrnav-20120810.tar.gz
 -/vfrnav-20120815.tar.gz
 -/vfrnav-20120831.tar.gz
 -/vfrnav-20121111.tar.gz
 -/vfrnav-20121212.tar.gz
 -/vfrnav-20130110.tar.gz
 -/vfrnav-20130113.tar.gz
 -/vfrnav-20130123.tar.gz
 -/vfrnav-20130303.tar.gz
 -/vfrnav-20130429.tar.gz
 -/vfrnav-20130510.tar.gz
 -/vfrnav-20130627.tar.gz
 -/vfrnav-20130723.tar.gz
 -/vfrnav-20130801.tar.gz
 -/vfrnav-20130829.tar.gz
 -/vfrnav-20130920.tar.gz
 +vfrnav-*.tar.gz
+ /vfrnav-20131127.tar.gz