Module: sip-router Branch: janakj/oracle Commit: 43e68d1c8d3177718844b2f0f36a31a79b014dee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43e68d1c...

Author: Jan Janak jan@iptel.org Committer: Jan Janak jan@iptel.org Date: Mon Feb 16 01:08:28 2009 +0100

Merge branches 'janakj/oracle' and 'master' of ssh://janakj@git.sip-router.org/sip-router into oracle

* 'janakj/oracle' of ssh://janakj@git.sip-router.org/sip-router:

* 'master' of ssh://janakj@git.sip-router.org/sip-router: Database flags renamed from DB_* to SRDB_* to avoid conflicts.

---