[Merge] lp:~laney/ubuntu/vivid/0ad/test into lp:ubuntu/0ad

[Iain Lane]

Iain Lane has proposed merging lp:~laney/ubuntu/vivid/0ad/test into lp:ubuntu/0ad.

Requested reviews:
  Sebastien Bacher (seb128)

For more details, see:
https://code.launchpad.net/~laney/ubuntu/vivid/0ad/test/+merge/246873
-- 
Your team Ubuntu branches is subscribed to branch lp:ubuntu/0ad.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 111 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20150119/16152642/attachment.diff>