Merge branch 'tg/next/1.0__crypto' into tg/next/1.0
commit12d5398e500cecf9b0f23618092da3a2a21f618d
authorToni Gundogdu <legatvs@gmail.com>
Fri, 1 Feb 2013 16:31:49 +0000 (1 18:31 +0200)
committerToni Gundogdu <legatvs@gmail.com>
Fri, 1 Feb 2013 16:31:49 +0000 (1 18:31 +0200)
tree82fd967cdb9fcb5b8aa3aeb4dde8a6afd71d8208
parent67e286bac89e8c19a5b860fcdac7c7b6acaba90a
parentd57dab03640be800fad4981ae7db02524f3bc04a
Merge branch 'tg/next/1.0__crypto' into tg/next/1.0