[sr-dev] git:master: Merge branch 'master' of ssh://git.sip-router.org/kamailio

[Hugh Waite]

Module: sip-router
Branch: master
Commit: 3a5af040ed8dc84d37a8e1d21d9b1fbe4cf2263d
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a5af040ed8dc84d37a8e1d21d9b1fbe4cf2263d

Author: Hugh Waite <hugh.waite at crocodile-rcs.com>
Committer: Hugh Waite <hugh.waite at crocodile-rcs.com>
Date:   Tue Jan  7 11:57:31 2014 +0000

Merge branch 'master' of ssh://git.sip-router.org/kamailio

* 'master' of ssh://git.sip-router.org/kamailio:
  permissions: fixed previous commit which used invalid variable
  presence_dialoginfo: handle all states to get most relevant xml
  tls: the pointer of cfg structure
  websocket: store sub protocol value for later use in encode_and_send_ws_frame()
  htable: free temporary slots used to reload hash table via rpc command
  htable: use system malloc for temporary allocation of hash table realod slots
  permissions: refreshed the README file
  permissions: note about peer tag mode that applies only for allow_trusted()
  permissions: set peer tag avp for allow_address_group()

---