Victor Olaya 2231971ead Merge branch 'master' of https://github.com/qgis/Quantum-GIS
Conflicts:
	python/plugins/sextante/algs/ftools/Difference.py
	python/plugins/sextante/algs/ftools/Intersection.py
	python/plugins/sextante/outputs/OutputTable.py
2013-01-21 23:10:50 +01:00
..
2013-01-12 12:42:00 +01:00