[sr-dev] git:mgw/json: Merge remote-tracking branch 'origin/4.0' into mgw/json

[Matthew Williams]

Module: sip-router
Branch: mgw/json
Commit: af812b82619e60f744e3aecdb6b07783fb732e4f
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af812b82619e60f744e3aecdb6b07783fb732e4f

Author: Matthew Williams <mgwilliams at gmail.com>
Committer: Matthew Williams <mgwilliams at gmail.com>
Date:   Tue May  7 09:55:11 2013 -0700

Merge remote-tracking branch 'origin/4.0' into mgw/json

---