Merge pull request #2613 from aTanW/master
authorHannu Nyman <hannu.nyman@iki.fi>
Tue, 19 Apr 2016 20:23:36 +0000 (23:23 +0300)
committerHannu Nyman <hannu.nyman@iki.fi>
Tue, 19 Apr 2016 20:23:36 +0000 (23:23 +0300)
joe: bump to upstream v 4.2


Trivial merge