11 Sep
2014
11 Sep
'14
2:57 p.m.
Module: sip-router Branch: master Commit: 74f53b7d7f6ff00144152aff453e6b388447320c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74f53b7d...
Author: Carsten Bock carsten@ng-voice.com Committer: Carsten Bock carsten@ng-voice.com Date: Thu Sep 11 16:56:51 2014 +0200
Merge branch 'master' of ssh://git.sip-router.org/sip-router into carstenbock/db_cassandra_deb
Conflicts: Makefile.groups pkg/kamailio/deb/wheezy/control pkg/kamailio/deb/wheezy/rules
---