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

[sailer]

commit d8bc2153c15cda12c81f91844679a89889881c20
Merge: 6004238 69366f0
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Tue Apr 30 04:52:27 2013 +0200

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

 vfrnav.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---