tree ecda63633774e9a428e0e10c832159243f78ba2a
parent a7c0656a530ca405d2ed18b8e9bd252975bb8505
parent 27c80af1dd9b871ab44452a8de22fd9cabaa184c
author Andrey Andreev <narf@bofh.bg> 1328136679 +0200
committer Andrey Andreev <narf@bofh.bg> 1328136679 +0200

Merge upstream