ims_charging: Merge branch 'ims_charging' into master
authorCarsten Bock <carsten@ng-voice.com>
Wed, 16 Oct 2013 12:12:51 +0000 (14:12 +0200)
committerCarsten Bock <carsten@ng-voice.com>
Wed, 16 Oct 2013 12:12:51 +0000 (14:12 +0200)

Trivial merge