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

[sailer]

commit 3e16d46d873e7bc6efe13ac68c1db05f162d4007
Merge: 74e8714 ec67fbc
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Fri Aug 30 10:40:16 2013 +0200

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

 .gitignore  |    1 +
 sources     |    2 +-
 vfrnav.spec |   43 ++++++++++++++++++++++++++++++++++---------
 3 files changed, 36 insertions(+), 10 deletions(-)
---