tree 0c071f860f7fd8d9ab1480f67fc1c39e56f27991
parent 386c089ea519643b6e4b73508d571206a5a8c152
parent e3a68042c086acfc98ae273adbd8527af0c6ab8b
author Andrey Andreev <narf@bofh.bg> 1330623431 +0200
committer Andrey Andreev <narf@bofh.bg> 1330623431 +0200

Merge upstream branch