[Merge] lp:~hannahermsen/ubuntu/trusty/ristretto/bug-1284111 into lp:ubuntu/trusty/ristretto

[Hanna Hermsen]

Hanna Hermsen has proposed merging lp:~hannahermsen/ubuntu/trusty/ristretto/bug-1284111 into lp:ubuntu/trusty/ristretto.

Requested reviews:
  Ubuntu branches (ubuntu-branches)

For more details, see:
https://code.launchpad.net/~hannahermsen/ubuntu/trusty/ristretto/bug-1284111/+merge/225450

I previously submitted these fixes, but separately. By reading the documentation I thought it should be done like that, but on Sebastien Bacher's request I merged them to one fix.
-- 
https://code.launchpad.net/~hannahermsen/ubuntu/trusty/ristretto/bug-1284111/+merge/225450
Your team Ubuntu branches is requested to review the proposed merge of lp:~hannahermsen/ubuntu/trusty/ristretto/bug-1284111 into lp:ubuntu/trusty/ristretto.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 3949 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140703/5fc504d7/attachment.diff>