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

[Rex Dieter]

commit 07749124ce984a50e4054132ce970dd93d3a8c94
Merge: 738ee3b 087c79a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Mar 11 11:15:20 2015 -0500

    Merge branch 'master' into f20

 marble-14.12.3-app_versions.patch | 51 +++++++++++++++++++++++++++++++++++++++
 marble-4.12.0-app_versions.patch  | 32 ------------------------
 marble.spec                       | 30 ++++++++++++++++++++---
 3 files changed, 77 insertions(+), 36 deletions(-)
---