Merge branch 'tg/next__fix_media/vimeo' into next
authorToni Gundogdu <legatvs@gmail.com>
Sat, 30 Nov 2013 15:47:29 +0000 (30 17:47 +0200)
committerToni Gundogdu <legatvs@gmail.com>
Sat, 30 Nov 2013 15:47:29 +0000 (30 17:47 +0200)

Trivial merge