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)
commitea8d943b8f367d6fe84a2c148b7e27427595a18b
treeb23e2b737606a70a5701b8459a4eb2d4bf67dcd8
parent656f2eb5a779ac40c818b322ce7d9059e147bad7
parent59b78cf119b6963d16097e5a035659f3ef16c843
Merge pull request #2613 from aTanW/master

joe: bump to upstream v 4.2