[sr-dev] git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

[Olle E. Johansson]

Module: sip-router
Branch: master
Commit: 139acd4a3ba4117d218c8ef4d95710dc15fb8bc7
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=139acd4a3ba4117d218c8ef4d95710dc15fb8bc7

Author: Olle E. Johansson <oej at edvina.net>
Committer: Olle E. Johansson <oej at edvina.net>
Date:   Mon Nov 19 15:45:38 2012 +0100

Merge branch 'master' of ssh://git.sip-router.org/sip-router

* 'master' of ssh://git.sip-router.org/sip-router:
  core: handle '\r' as end of included file name
  pkg/kamailio/(centos|fedora): turned on MEMDBG for development builds

---