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

[Olle E. Johansson]

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

Author: Olle E. Johansson <oej at edvina.net>
Committer: Olle E. Johansson <oej at edvina.net>
Date:   Sun Oct 21 18:32:33 2012 +0200

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

* 'master' of ssh://git.sip-router.org/sip-router:
  modules/rtpproxy: some README improvements
  pkg/kamailio/fedora/16: More tweaks to .spec
  pkg/kamailio/(centos|fedora): Updated boxgrinder appliance definitions
  pkg/kamailio/fedora/16: added SCTP dependencies to .spec
  pkg/kamailio/fedora/16: Updated .spec file
  Makefiles: Updated Makefiles to use db2x_docbook2man when docbook2x-man is not installed
  pkg/kamailio/fedora/16: Updated .spec to set ownership of /etc/kamailio to kamailio.kamailio
  modules/websocket: Updated example configuration file
  modules/msrp: Updated MSRP configuration example
  rtpproxy: allow flags parameter to rtpproxy_destroy()

---