tree 4f3dc65452c6a3903678c283fdebf4128c8c64af
parent f7aed129051475b4baeeb549a764464560c9dd34
parent ffa86e89fbcaeb8726089e35c3c5ab5b01214b9c
author Andrey Andreev <narf@bofh.bg> 1323939785 +0200
committer Andrey Andreev <narf@bofh.bg> 1323939785 +0200

Merge remote-tracking branch 'upstream/2.1-stable' into 2.1-stable