Merge branch 'media_panel'
authorBoris Bobrov <breton@cynicmansion.ru>
Fri, 5 Feb 2016 01:33:05 +0000 (04:33 +0300)
committerBoris Bobrov <breton@cynicmansion.ru>
Fri, 5 Feb 2016 01:33:05 +0000 (04:33 +0300)

Trivial merge