Merge branch 'my-origin/master'
authoratomizer <danila.gerasimov@gmail.com>
Mon, 7 Jan 2013 13:03:58 +0000 (17:03 +0400)
committeratomizer <danila.gerasimov@gmail.com>
Mon, 7 Jan 2013 13:03:58 +0000 (17:03 +0400)

Trivial merge