[vfrnav/f17: 5/5] Merge remote-tracking branch 'origin/f18' into f17

[sailer]

commit 311c5a93d3b927ac9d2a441e6cf9691c2d240317
Merge: c390e8b e79b024
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Thu Jan 10 03:42:58 2013 +0100

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

 .gitignore  |    1 +
 sources     |    2 +-
 vfrnav.spec |    9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)
---