[vfrnav/f20: 8/8] fix merge

[Peter Robinson]

commit 280249a1af8e01da9a6776ccc761407eda83644b
Merge: ec67fbc 673e1ae
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Oct 14 14:03:38 2013 +0100

    fix merge

 .gitignore          |   24 +-----------------------
 sources             |    2 +-
 vfrnav-webkit.patch |   22 ++++++++++++++++++++++
 vfrnav.spec         |   27 ++++++++++++++++++++++++++-
 4 files changed, 50 insertions(+), 25 deletions(-)
---