Merge remote-tracking branch 'main/master'
authorMarko Kreen <markokr@gmail.com>
Mon, 31 Aug 2015 16:33:03 +0000 (19:33 +0300)
committerMarko Kreen <markokr@gmail.com>
Mon, 31 Aug 2015 16:33:03 +0000 (19:33 +0300)

Trivial merge