tree d3873aab681bd16de76ca20a29e80b5daa1ac7fb
parent aa8a36acdbb31b0850747ddf0d2aaff0ab7e657f
parent 850f601edef5de5680510c900c3e613bc346fe1b
author Andrey Andreev <narf@bofh.bg> 1330610515 +0200
committer Andrey Andreev <narf@bofh.bg> 1330610515 +0200

Merge upstream branch