[marble/f20: 6/6] Merge branch 'master' into f20

[Rex Dieter]

commit 738ee3ba27a252689a6ae05505f9c988befd36cc
Merge: beca23b df2d53d
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:06:49 2015 -0600

    Merge branch 'master' into f20

 .gitignore                                         |   2 +
 marble-14.12.1-marblewidget.patch                  | 331 +++++++++++++++++++++
 ...e-14.12.1-opencachingcom_Qt5WebKitWidgets.patch |  12 +
 marble.spec                                        | 176 ++++++++++-
 sources                                            |   2 +-
 5 files changed, 506 insertions(+), 17 deletions(-)
---