Merge branch 'master' into ltreeowner
commit2549953de12a864ae2767339e3bf4ea596f23c9b
authorPetr Baudis <pasky@ucw.cz>
Sun, 13 Feb 2011 15:04:57 +0000 (13 16:04 +0100)
committerPetr Baudis <pasky@ucw.cz>
Sun, 13 Feb 2011 15:04:57 +0000 (13 16:04 +0100)
tree5adf14f269e937229461549b3de58843cb189c15
parent67d48820fd4e8a8d67442fcb99a779337fc7be36
parent9c8a096e0f972a7faab9329c25d13e84724a98d3
Merge branch 'master' into ltreeowner

Conflicts:
uct/walk.c
uct/walk.c