[sr-dev] git:pd/websocket: Merge branch 'master' into websocket

[Peter Dunkley]

Module: sip-router
Branch: pd/websocket
Commit: 1792586578d9680d45d52af37ddf2786b8b30ca8
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1792586578d9680d45d52af37ddf2786b8b30ca8

Author: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Date:   Wed Jul  4 18:08:02 2012 +0100

Merge branch 'master' into websocket

* master:
  modules/lcr: Fixed to/from_gw tests when proto parameter is 0 (ANY)
  cdp_avp: added README file
  CDP: Fixed README
  CDP: A few fixes to docs and location of image files - cleaner organisation
  new modules: CDP (C Diameter Peer) and CDP_AVP 	- These modules were originally written by Fraunhofer and have been 	  ported to Kamailio, with some minor additions and improvements. Examples 	  on using the modules to come shortly - diameter_rx, diameter_ro, etc

---