[qgit/el6: 4/4] Merge branch 'master' into el6

[Dan Horák]

commit f25bc714f3103464f8312594c088063c71aab787
Merge: afdd25a a3dce38
Author: Dan Horák <dan at danny.cz>
Date:   Mon May 27 21:53:09 2013 +0200

    Merge branch 'master' into el6

 .gitignore                   |    1 +
 qgit-2.4-fix-line-skew.patch |   15 ---------------
 qgit.spec                    |   36 +++++++++++++++++++++---------------
 sources                      |    2 +-
 4 files changed, 23 insertions(+), 31 deletions(-)
---