tree 5d71422853b5d6ea1470b187fdfa1d042cab978a
parent a92c7cdeddd9f1b46a6c8f254b2949ad047bbc21
parent 08856b8738ea4fc17b13986c9f2619383cb4a6e9
author Andrey Andreev <narf@bofh.bg> 1330737923 +0200
committer Andrey Andreev <narf@bofh.bg> 1330737923 +0200

Merge upstream branch