Merge branch 'master' into mariusbucur/dmq
authorMarius Bucur <marius@marius-bucur.ro>
Sat, 4 Jun 2011 07:35:37 +0000 (10:35 +0300)
committerMarius Bucur <marius@marius-bucur.ro>
Sat, 4 Jun 2011 07:35:37 +0000 (10:35 +0300)
commit84b87a9afe9d56a1ef636c664370b458daa0db33
tree5e0b64245fe919314668448a4a60c4444b33d7ce
parentcba881c53ae0904ee296974805e81edbdf81cd6d
parent510b4cb8830b3cf760a84f72ad810fb202522abd
Merge branch 'master' into mariusbucur/dmq

Conflicts:
modules_k/htable/ht_api.c
modules_k/htable/ht_api.h
modules_k/htable/ht_api.c
modules_k/htable/ht_api.h
modules_k/htable/ht_var.c
modules_k/htable/ht_var.h
modules_k/htable/htable.c