[QGIS Commit] [qgis/Quantum-GIS] 078f0d: Fix python zebra style test

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 078f0d0ad275b0d1245ae649b92a07c1d3ff3595
      https://github.com/qgis/Quantum-GIS/commit/078f0d0ad275b0d1245ae649b92a07c1d3ff3595
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M tests/src/python/test_qgscomposermap.py

  Log Message:
  -----------
  Fix python zebra style test


  Commit: 0e036eeb0e054c9ba85fd6ca38b06ff8d6309f92
      https://github.com/qgis/Quantum-GIS/commit/0e036eeb0e054c9ba85fd6ca38b06ff8d6309f92
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M src/ui/qgisapp.ui

  Log Message:
  -----------
  Merge branch 'master' of github.com:qgis/Quantum-GIS


Compare: https://github.com/qgis/Quantum-GIS/compare/eb02e915d935...0e036eeb0e05