[Merge] lp:~robru/friends/trunk into lp:friends

[noreply at launchpad.net]

The proposal to merge lp:~robru/friends/trunk into lp:friends has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~robru/friends/trunk/+merge/204958
-- 
https://code.launchpad.net/~robru/friends/trunk/+merge/204958
Your team Super Friends is requested to review the proposed merge of lp:~robru/friends/trunk into lp:friends.