Merge branch 'tg/next/1.0' into nextv0.9.0
authorToni Gundogdu <legatvs@gmail.com>
Sun, 14 Apr 2013 13:50:03 +0000 (16:50 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Sun, 14 Apr 2013 13:50:03 +0000 (16:50 +0300)
commit85a58cfb03b1375fd3a2def83b0926a5ea8a5e99
tree59edd75a558a33b8d3f833feaa5c2b23990c9462
parentaafc1abadef32dc50eface66b3d221eb8e2118d5
parentbb416a1bc48291c462f77cb5d777b3d40c8655de
Merge branch 'tg/next/1.0' into next

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