[qgis/epel7: 2/2] Merge branch 'master' into epel7

[Dave Johansen]

commit 3a18fe2d2b66ea75b4cfc400daee2ba24dc54b34
Merge: aa0543a eab7dca
Author: Dave Johansen <davejohansen at gmail.com>
Date:   Fri Jan 2 13:57:03 2015 -0700

    Merge branch 'master' into epel7

 .gitignore             |    1 +
 qgis-2.6.0-qreal.patch |   47 -----------------------------------------------
 qgis.spec              |   11 +++++------
 sources                |    2 +-
 4 files changed, 7 insertions(+), 54 deletions(-)
---