[Merge] lp:~noskcaj/ubuntu/utopic/obexftp/merge2 into lp:ubuntu/obexftp

[Martin Pitt]

The proposal to merge lp:~noskcaj/ubuntu/utopic/obexftp/merge2 into lp:ubuntu/obexftp has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~noskcaj/ubuntu/utopic/obexftp/merge2/+merge/229131
-- 
https://code.launchpad.net/~noskcaj/ubuntu/utopic/obexftp/merge2/+merge/229131
Your team Ubuntu branches is subscribed to branch lp:ubuntu/obexftp.