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

[Dan Horák]

commit afdd25a924a33e1453cd81764f0b776b8e26006c
Merge: d6e380f 8e519af
Author: Dan Horák <dan at danny.cz>
Date:   Fri Sep 14 09:02:29 2012 +0200

    Merge branch 'master' into el6

 qgit-2.4-fix-line-skew.patch |   15 +++++++++++++++
 qgit.spec                    |   14 +++++++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---