[Merge] lp:~diodon-team/diodon/new-upstream-release-1.2.0 into lp:ubuntu/diodon

[Oliver Sauder]

I have tried this before but the merge conflicts strangely enough do not disappear... I have now pushed such a branch with fixed merged conflicts to lp:~diodon-team/diodon/new-upstream-release-1.2.0

The merge conflict is actually fairly easy to fix with the following commands:

bzr rm plugins/zeitgeist/
cp wscript.OTHER wscript
bzr resolved --all
-- 
https://code.launchpad.net/~diodon-team/diodon/new-upstream-release-1.2.0/+merge/229496
Your team Ubuntu branches is subscribed to branch lp:ubuntu/diodon.