[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: b1260bbb3a5c67c628234df19d8aec29dfb01a41
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1260bbb3a5c67c628234df19d8aec29dfb01a41

Author: Richard Good <richard.good at smilecoms.com>
Committer: Richard Good <richard.good at smilecoms.com>
Date:   Thu Jun 20 11:22:49 2013 +0200

Merge branch 'master' into richard.good/diameter_rx_media

---