Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Russian translation update.
update GUI translation ja
Merge pull request #840 from artfwo/master

Russian translation update.
pl translation update; forms
[pyqgis-console] Add targets and python script for generating console's QScintilla .pap file, for auto-completion

- Run 'make;make qsci-pap-src; make install' to update the default .pap file in source tree
- Run 'make;make qsci-pap-master[; make install]' for local-only .pap that overrides the default .pap (when testing new bindings)
- Update console to override default .pap if master.pap is available
- Include new qgis.core.NULL attribute defined in <src>/python/__init__.py for QPyNullVariant comparisons
- Update 11-month-old default .pap
Merge pull request #841 from Cracert/master

Polish translatioin update
pl translation upadte: raster layers
fTools/union: fix output attribute shift
Merge pull request #843 from Cracert/master

Polish translation upadte
Merge pull request #844 from minorua/union_attrs

fTools/union: fix output attribute shift
update GUI translation JA
List of IT translators updated and sorted
Merge branch 'master' of github.com:qgis/Quantum-GIS
[labeling] Fix python bindings for access to data defined properties
[pyqgis-console] Fix pyqgis.pap building targets/script for auto-completion in console

- Add fixed default pyqgis.pap
translation update: fr and it
[pyqgis-console] minor fixes for italian translation
[pyqgis-console] adds a "\n" at the end of the header text if it has not been inserted from translators