Trident: (Dolphin to Trident in OAuth)
Merge branch 'master' of https://github.com/boonex/dolphin