Merge branch 'tg/next/1.0_rename_protocol_categories' into tg/next/1.0
commit5bf1378595c7688d2b96734e9153bb65f7173fdc
authorToni Gundogdu <legatvs@gmail.com>
Sat, 4 Aug 2012 11:58:57 +0000 (4 14:58 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Sat, 4 Aug 2012 11:58:57 +0000 (4 14:58 +0300)
treec592a6c55cf4125d72988071570829ff913526c2
parent32a4c2c8cbffa9761b7609c5d198d7a2498f9b7c
parentc60db6b54b85a276b022114b25f4b74d7fd157aa
Merge branch 'tg/next/1.0_rename_protocol_categories' into tg/next/1.0