Merge branch 'tg/next__fix_media/publicsenat' into next
authorToni Gundogdu <legatvs@gmail.com>
Tue, 26 Nov 2013 14:35:25 +0000 (26 16:35 +0200)
committerToni Gundogdu <legatvs@gmail.com>
Tue, 26 Nov 2013 14:35:25 +0000 (26 16:35 +0200)

Trivial merge