tree 5bc1ef2a75abb0d85a3ab2cece365eed9e516470
parent 4f50256a84e8052fc3356683f28286d36f8a322c
parent 81c934729d9fcbb294a8914608c315eed30ff9c4
author Andrey Andreev <narf@devilix.net> 1415709196 +0200
committer Andrey Andreev <narf@devilix.net> 1415709196 +0200

Fix merge conflicts