[Merge] lp:~noskcaj/ubuntu/saucy/nootka/upstream-merge into lp:ubuntu/nootka

[Jonathan Riddell]

The proposal to merge lp:~noskcaj/ubuntu/saucy/nootka/upstream-merge into lp:ubuntu/nootka has been updated.

    Status: Work in progress => Merged

For more details, see:
https://code.launchpad.net/~noskcaj/ubuntu/saucy/nootka/upstream-merge/+merge/173865
-- 
https://code.launchpad.net/~noskcaj/ubuntu/saucy/nootka/upstream-merge/+merge/173865
Your team Ubuntu branches is requested to review the proposed merge of lp:~noskcaj/ubuntu/saucy/nootka/upstream-merge into lp:ubuntu/nootka.