Module: sip-router Branch: tmp/ims_charging Commit: f96c7f5a44e510dbc0e3483d98c8484a6a603c23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f96c7f5… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 22:36:35 2013 +0200 Merge branch 'tmp/ims_charging' of ssh://git.sip-router.org/sip-router into ims_charging Conflicts: modules/ims_charging/README modules/ims_charging/doc/ims_charging.xml modules/ims_charging/doc/ims_charging_admin.xml modules/ims_charging/mod.c ---