[Merge] lp:~unit193/ubuntu/vivid/xiphos/update into lp:ubuntu/xiphos

[Micah Gersten]

The proposal to merge lp:~unit193/ubuntu/vivid/xiphos/update into lp:ubuntu/xiphos has been updated.

    Status: Needs review => Work in progress

For more details, see:
https://code.launchpad.net/~unit193/ubuntu/vivid/xiphos/update/+merge/249721
-- 
Your team Ubuntu branches is requested to review the proposed merge of lp:~unit193/ubuntu/vivid/xiphos/update into lp:ubuntu/xiphos.