Merge remote-tracking branch 'gamato/master'
authorMarko Kreen <markokr@gmail.com>
Thu, 3 Apr 2014 15:18:03 +0000 (18:18 +0300)
committerMarko Kreen <markokr@gmail.com>
Thu, 3 Apr 2014 15:18:03 +0000 (18:18 +0300)

Trivial merge