tree f68ad9bddcf12888eceda2ed0cd50a8175a9eea9
parent 1a361209cf77133d2a38132cebe1db17df04a7d4
parent e92df33e7dda139ee46bddca31aebb4cd5d452fd
author Andrey Andreev <narf@bofh.bg> 1332791162 +0300
committer Andrey Andreev <narf@bofh.bg> 1332791162 +0300

Merge upstream branch