Launchpad automatic translations update.
Launchpad automatic translations update.
Launchpad automatic translations update.
Launchpad automatic translations update.
Launchpad automatic translations update.
Merge branch 'master' of bzr::lp:openobject-addons/6.1; branch 'master' of bzr::lp:ocb-addons/6.1 into ocb-6.1

why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.