Merge branch 'tg/next__redo_url_{un}escaping' into next
authorToni Gundogdu <legatvs@gmail.com>
Tue, 15 Oct 2013 14:38:29 +0000 (15 17:38 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Tue, 15 Oct 2013 14:38:29 +0000 (15 17:38 +0300)

Trivial merge