Null merge

This commit is contained in:
Serhiy Storchaka 2017-01-12 19:43:15 +02:00
commit 97bf592925