Merge pull request #6548 from fnorf:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 25 May 2016 13:16:07 +0000 (13:16 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 25 May 2016 13:16:07 +0000 (13:16 +0000)
commit90b844792d0c0a306b434e1e4b328bbece8feff8
treeb40028f933e4126a1968df899fa977536f5669f7
parent98c9d475371879274a5a0571f83a273c04469649
parent66549414ddeba5b658a1390500e5fb61e164fef3
Merge pull request #6548 from fnorf:master