Merge remote-tracking branch 'petr/master'
authorMarko Kreen <markokr@gmail.com>
Mon, 8 Jul 2013 10:24:14 +0000 (13:24 +0300)
committerMarko Kreen <markokr@gmail.com>
Mon, 8 Jul 2013 10:24:14 +0000 (13:24 +0300)

Trivial merge