Merge git://gitorious.org/minitube/minitube