WMS Tile retry feature
better message logging for WMS retry
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Improve visual appearance of composer grid by making sure it is always drawn using a 1 pixel width cosmetic pen
Remove options for composer pen width
Add option for grid snap tolerance, move selection tolerance spin box to new section (fix #8214)
Fix #8769 - Missing flags for 3 locales

Fixed the images related to servian translations, ignore the 'en'
translation (overrided for 'en_US') in the load of the QsgOptions
dialog.
Allow listing all available plugin layers
fix link errors on windows
creatensis: build installed.db for osgeo4w-setup
fix build with Qt <4.7 (eg. Debian Lucid)
Lithuanian translation update
Use const pointer for QgsExpression:replaceExpressionText()
Add uuid function for expression engine
Merge pull request #929 from tomass/master

Lithuanian translation update
Add option to insert a NULL value in a value map when loaded from layer
Fix #8776

Set the canvas color in 'qgsprojectproperties::apply()' before refresh