tux3/qTox — pull request #261 by dubslow (2014-09-05 11:21:57+00:00)
Title: profiles that doesn't conflict with master?

I dunno what's up, but the most recent commit on profiles, 5ae82b125a, was a conflict-free merge from tux3:master