[QGIS Commit] [qgis/Quantum-GIS] 06bda9: Merge branch 'composeritem_xml'

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS

  Commit: 06bda9c3aa1989c9d0d64116ff40565ba401059e
      https://github.com/qgis/Quantum-GIS/commit/06bda9c3aa1989c9d0d64116ff40565ba401059e
  Author: marco <marco at marco-laptop.(none)>
  Date:   2011-12-07 (Wed, 07 Dec 2011)

  Changed paths:
    M python/core/qgscomposition.sip
  M python/gui/qgscomposerview.sip
  M src/app/composer/qgscomposer.cpp
  M src/core/composer/qgscomposition.cpp
  M src/core/composer/qgscomposition.h
  M src/gui/qgscomposerview.cpp
  M src/gui/qgscomposerview.h

  Log Message:
  -----------
  Merge branch 'composeritem_xml'