[sr-dev] git:master: Merge branch 'master' into script_callbacks

[Miklos Tirpak]

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

Author: Miklos Tirpak <miklos at iptel.org>
Committer: Miklos Tirpak <miklos at iptel.org>
Date:   Thu Jun  4 09:35:00 2009 +0200

Merge branch 'master' into script_callbacks

* master:
  route_type: branch and onsend route bugs corrected
  * Commented out warning about deprecated avp name syntax.  I suggest to
  sl(k) - use load_tm_api()
  * modules_k/textops
  core: added km_parse_avp_spec()
  pv: parse K-style AVP aliases
  docbook: Generate TOC for root-level section elements
  make: required version is now 3.81
  test: gcc version test scripts
  tm: doc - added note about tmx module
  pua: use load_tm_api() instead of find_export()/load_tm()
  kex: added K pv_printf() function
  kex: added K dst uri related functions
  makefile: fix last commit
  * modules_k/acc: included Makefile.radius
  makefile: gcc version detection fix

Conflicts:

	onsend.h

---