Merge branch 'master' of ssh://git.sip-router.org/sip-router into carstenbock/db_cass...
authorCarsten Bock <carsten@ng-voice.com>
Thu, 11 Sep 2014 14:56:51 +0000 (16:56 +0200)
committerCarsten Bock <carsten@ng-voice.com>
Thu, 11 Sep 2014 14:56:51 +0000 (16:56 +0200)
commit74f53b7d7f6ff00144152aff453e6b388447320c
treea4d9cd38b7f5cd23a450ec3588d116436792cec7
parent42ce9344e19ac8b102722737a48d784c9954bec7
parentdfe22fd0c69d58702e8d12ba4f6b7891bb48896e
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
Makefile.groups
pkg/kamailio/deb/wheezy/control
pkg/kamailio/deb/wheezy/rules