tree b23a13c799a788d8b01fac0632961ef4f9d7929c
parent 03077f9ab1408d28b5b9783355d1629eda3ff5ae
parent 31e5cfd672fe3d37e3a317b71ea207027e4f9353
author Andrey Andreev <narf@devilix.net> 1391777696 +0200
committer Andrey Andreev <narf@devilix.net> 1391777696 +0200

Fix conflicts