Merge branch 'tg/next/1.0__crypto' into tg/next/1.0
commit2deab147b6c57ef8ae3a741a1445d1fac1915dec
authorToni Gundogdu <legatvs@gmail.com>
Fri, 1 Feb 2013 09:39:35 +0000 (1 11:39 +0200)
committerToni Gundogdu <legatvs@gmail.com>
Fri, 1 Feb 2013 09:39:35 +0000 (1 11:39 +0200)
tree65ffdfe0e459c050673ab6e064778ac20eb18196
parentd17ab4ee7251ff618ae6a2f3e82f8e04953654cd
parentf485eb56f2af0bcc1144518b39ad33bf39504cef
Merge branch 'tg/next/1.0__crypto' into tg/next/1.0