[SCM] qgis branch, master, updated. upstream/2.0.1-13436-g7969474

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 6c4c96a884feb8bd13106edf7520636e497518ac
Merge: a2ee769957385f4e084c5e8b6ba178a8c877d1db 966a71b6c8a5c8aa3965d805c2dddca95a1b9a04
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Sep 26 21:50:55 2013 +0200

    Merge branch 'upstream'
    
    Conflicts: many


-- 
The Quantum GIS in Debian project