[sr-dev] git:richard.good/diameter_rx_media: Merge branch 'master' into richard.good /diameter_rx_media

[Richard Good]

Module: sip-router
Branch: richard.good/diameter_rx_media
Commit: 7fd9b4a61b85cc28b54143a467da53230e35e2fc
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fd9b4a61b85cc28b54143a467da53230e35e2fc

Author: Richard Good <richard.good at smilecoms.com>
Committer: Richard Good <richard.good at smilecoms.com>
Date:   Thu Oct 17 14:29:16 2013 +0200

Merge branch 'master' into richard.good/diameter_rx_media

---