tree 4ce3243d214073bcbd4ee682902baa17b813c0b1
parent 34f75799285ca39741deaba9955ea07e6b9756a5
parent c016a1102e2a77e0c27b9656c19a0460df24dfb6
author Andrey Andreev <narf@bofh.bg> 1331297515 +0200
committer Andrey Andreev <narf@bofh.bg> 1331297515 +0200

Merge upstream branch