tree e51bdbe131cd07bad9743a797ba45ee9d4fdd5cd
parent e3d66af0845c0b9f995d1890d890cfd36ce1f3fc
author Andrey Andreev <narf@devilix.net> 1421672048 +0200
committer Andrey Andreev <narf@devilix.net> 1421672048 +0200

[ci skip] Manually apply PR #3461

I would've merged it earlier, but that would cause conflicts when feature/session
is merged.