[GeographicLib/el6: 3/3] Merge branch 'master' into el6

[rmattes]

commit 3e04e96f0040991bc2529c4a61b99e243469fa8e
Merge: 1a43ecf fdea836
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sun Jan 4 09:58:02 2015 -0500

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 ...7-rpath.patch => GeographicLib-1.40-rpath.patch |    6 +++---
 GeographicLib.spec                                 |    9 ++++++---
 sources                                            |    2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
---