Merge branch 'master' into ltreeowner
commit7f8e87db7650bc534fa64914ce2f0ee02ebf8b38
authorPetr Baudis <pasky@ucw.cz>
Mon, 16 May 2011 09:15:49 +0000 (16 11:15 +0200)
committerPetr Baudis <pasky@ucw.cz>
Mon, 16 May 2011 09:15:49 +0000 (16 11:15 +0200)
tree6cfcd5dc15aa6ef7f6da6b4a32508741f5d7218b
parent2f5699250c2aa259c8290ac230876265b5057b90
parent7276b6f03a4608a54fd38dfd6dd2897968835607
Merge branch 'master' into ltreeowner

Conflicts:
uct/tree.c
uct/internal.h
uct/policy/ucb1amaf.c
uct/tree.c
uct/tree.h
uct/walk.c