Merge branch 'tg/next__add_support__media/majestyc.lua' into next
commit7e09489af497703e4134bca52ffc0c4de4e82340
authorToni Gundogdu <legatvs@gmail.com>
Tue, 15 Oct 2013 14:47:07 +0000 (15 17:47 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Tue, 15 Oct 2013 14:47:07 +0000 (15 17:47 +0300)
tree7ce8d6a6dc9e428a24832bdfd9d28e82d792e5e8
parent19e0093797d4746d89c5ea668b361f0632b73a5d
parentb5f92db67345013023d858b960aabfe2f71650c8
Merge branch 'tg/next__add_support__media/majestyc.lua' into next
share/Makefile.am
tests/media/tests.mk