[QGIS Commit] [qgis/Quantum-GIS] 3305cc: fix #6151

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 3305ccda50c3e64ed85ffc6d90ecc6f74f553b74
      https://github.com/qgis/Quantum-GIS/commit/3305ccda50c3e64ed85ffc6d90ecc6f74f553b74
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

  Changed paths:
    M python/plugins/fTools/tools/doMergeShapes.py

  Log Message:
  -----------
  fix #6151