WIP
Merge branch 'master' into colour_functions
Colour functions and en-US help files implemented.
Fixed indentation in qgsexpression.cpp
Code name consistency fix and unit tests for functions
Merge remote-tracking branch 'origin/master' into oldLabeling4master
Always set "SHAPE_ENCODING" GDAL config option to "" in QgsVectorFileWriter (follows up commit:c0551a6)
Set the ENCODING layer creation option when creating a new empty Shapefile. Thanks to Minoru Akagi.
[sextante] added commander
Merge branch 'master' into colour_functions
Merge pull request #531 from ccrook/colour_functions

Colour functions
Small cleanup for e0838b0
Fix for #3743, georeferencer: can't set map coords from map canvas on Mac
Merge remote-tracking branch 'origin/master' into oldLabeling4master
Merge remote-tracking branch 'mygithub/oldLabeling4master' into oldLabeling4master