Merge remote branch 'derm/master'
commit369adb26a84ca8f72a710339cccf4a07368de61d
authorPetr Baudis <pasky@ucw.cz>
Tue, 2 Feb 2010 16:53:22 +0000 (2 17:53 +0100)
committerPetr Baudis <pasky@ucw.cz>
Tue, 2 Feb 2010 16:53:22 +0000 (2 17:53 +0100)
tree7c3271678cf194e8fffb308f13c2088d1a34f844
parent71bdac7ceb4e5b7344c1cfa5d3ed5d1d0f0ac3ce
parent6f465d10588d756aef6a09474b329df7088197ea
Merge remote branch 'derm/master'
uct/uct.c