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

[Robert Bruce Park]

Maybe this has changed recently but the last time I tried to fix that
warning, it just threw up another warning that we were ignoring the
return value from that function. Did you not see that warning when you
made that change? It's kind of a no-win situation and it's irrelevant
to the real change you want to make here.

-- 
https://code.launchpad.net/~kai-mast/friends/upstart/+merge/198999
Your team Super Friends is subscribed to branch lp:friends.