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

[Dan Horák]

commit d6e380f929620acc2d9a150c9b2b939b1d509d79
Merge: 3834f70 f0ebcba
Author: Dan Horák <dan at danny.cz>
Date:   Thu Dec 1 17:55:35 2011 +0100

    Merge branch 'master' into el6

 .gitignore                                   |    1 +
 qgit-2.3-qmake.patch => qgit-2.4-qmake.patch |    7 ++++---
 qgit.spec                                    |   25 ++++++++++++++++---------
 sources                                      |    2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)
---