Merge branch 'tg/next__add_support__{media/scan}/vzaar.lua' into next
commit19e0093797d4746d89c5ea668b361f0632b73a5d
authorToni Gundogdu <legatvs@gmail.com>
Tue, 15 Oct 2013 14:47:03 +0000 (15 17:47 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Tue, 15 Oct 2013 14:47:03 +0000 (15 17:47 +0300)
treefe3faed182ef0494bdb2833e596b67ecd6f2861e
parent182bfa8ebf4f2938def9d9f897f131145935a185
parentd79f9a22dd1aad1faf79192fa806d545eb886da6
Merge branch 'tg/next__add_support__{media/scan}/vzaar.lua' into next
share/Makefile.am
tests/media/tests.mk