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

[Raul Alexis Betancor Santana]

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

Author: Raul Alexis Betancor Santana <rabs at dimension-virtual.com>
Committer: Raul Alexis Betancor Santana <rabs at dimension-virtual.com>
Date:   Sun Jan  3 13:16:09 2010 +0000

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

* 'master' of ssh://rbetancor@git.sip-router.org/sip-router:
  drouting: lookup route block by name
  drouting: regenerate readme
  kamctl: added new db table definitions
  drouting: adding db table definitions

Conflicts:

	lib/srdb1/schema/dr_gateways.xml
	lib/srdb1/schema/dr_rules.xml
	lib/srdb1/schema/kamailio-drouting.xml

---