[sr-dev] git:mariusbucur/dmq: Merge branch 'master' into mariusbucur/dmq

[Marius Ovidiu Bucur]

Module: sip-router
Branch: mariusbucur/dmq
Commit: 84b87a9afe9d56a1ef636c664370b458daa0db33
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=84b87a9afe9d56a1ef636c664370b458daa0db33

Author: Marius Bucur <marius at marius-bucur.ro>
Committer: Marius Bucur <marius at marius-bucur.ro>
Date:   Sat Jun  4 10:35:37 2011 +0300

Merge branch 'master' into mariusbucur/dmq

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

---