[sr-dev] git:lazedo/4.2.1: Merge branch '4.2' into lazedo/4.2.1

[Luis Azedo]

Module: sip-router
Branch: lazedo/4.2.1
Commit: 8653006b3aaf124d5a7a0eb32cf9236c37bfc319
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8653006b3aaf124d5a7a0eb32cf9236c37bfc319

Author: Luis Azedo <luis at 2600hz.com>
Committer: Luis Azedo <luis at 2600hz.com>
Date:   Sat Nov 29 16:36:51 2014 +0000

Merge branch '4.2' into lazedo/4.2.1

---