Merge branch 'typing'
authorAndrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
Fri, 22 Aug 2014 15:23:56 +0000 (19:23 +0400)
committerAndrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
Fri, 22 Aug 2014 15:23:56 +0000 (19:23 +0400)

Trivial merge