Merge branch 'tg/next/1.0__cookie' into tg/next/1.0
authorToni Gundogdu <legatvs@gmail.com>
Sun, 24 Mar 2013 10:15:10 +0000 (24 12:15 +0200)
committerToni Gundogdu <legatvs@gmail.com>
Sun, 24 Mar 2013 10:15:10 +0000 (24 12:15 +0200)

Trivial merge