[Merge] lp:~kai-mast/friends-app/nicknames into lp:friends-app

[Robert Bruce Park]

The proposal to merge lp:~kai-mast/friends-app/nicknames into lp:friends-app has been updated.

Commit Message changed to:

Show nicknames besides display name for Twitter.

For more details, see:
https://code.launchpad.net/~kai-mast/friends-app/nicknames/+merge/205158
-- 
https://code.launchpad.net/~kai-mast/friends-app/nicknames/+merge/205158
Your team Super Friends is requested to review the proposed merge of lp:~kai-mast/friends-app/nicknames into lp:friends-app.