Merge remote-tracking branch 'origin/master'
authoryudanov <fedwiz@academ.org>
Mon, 22 Jul 2013 07:49:47 +0000 (14:49 +0700)
committeryudanov <fedwiz@academ.org>
Mon, 22 Jul 2013 07:49:47 +0000 (14:49 +0700)

Trivial merge