Merge branch 'tg/next/1.0' into nextv0.9.0
authorToni Gundogdu <legatvs@gmail.com>
Sun, 14 Apr 2013 13:50:03 +0000 (14 16:50 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Sun, 14 Apr 2013 13:50:03 +0000 (14 16:50 +0300)
Conflicts:
m4/version.m4
share/Makefile.am
share/lua/website/break.lua
share/lua/website/dailymotion.lua
share/lua/website/gaskrank.lua
share/lua/website/quvi/util.lua
share/lua/website/soundcloud.lua
share/lua/website/youtube.lua
tests/data/format/default/audioboo.json
tests/data/format/default/break.json
tests/data/format/default/fixme/bloomberg.json
tests/data/format/default/fixme/collegehumor.json
tests/data/format/default/fixme/mgnetwork.json
tests/data/format/default/funnyordie.json
tests/data/format/default/gaskrank.json
tests/data/format/default/metacafe.json
tests/data/format/default/nsfw/empflix.json
tests/data/format/default/nsfw/fixme/pornhub.json
tests/data/format/default/nsfw/xvideos.json
tests/data/format/default/nsfw/youjizz.json
tests/data/format/default/soundcloud-2.json
tests/data/format/default/soundcloud.json
tests/data/format/default/spiegel.json
tests/data/format/default/theonion.json
tests/data/format/default/theonion_2.json
tests/data/format/default/tvlux.json
tests/data/format/default/videobash.json
tests/data/format/default/vimeo.json
tests/t/expire.t


Trivial merge