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

[sailer]

commit 11165e8807ed564247edd32fbcbf3e27a80a6688
Merge: 311c5a9 20473ec
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Sun Mar 10 11:12:02 2013 +0100

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

 .gitignore  |    3 +++
 sources     |    2 +-
 vfrnav.spec |   21 +++++++++++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)
---