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

[Henning Westerholt]

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

Author: Henning Westerholt <hw at kamailio.org>
Committer: Henning Westerholt <hw at kamailio.org>
Date:   Tue May 27 12:17:37 2014 +0200

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

* 'master' of ssh://git.sip-router.org/sip-router:
  db_mysql: proper handling of mysql_next_result(...) return code
  ims_charging: bugfix: Make ims_charging:ccr_timeouts resettable

---