[sr-dev] git:carstenbock/rtpproxy: Merge branch 'master' into rtpproxy

[Carsten Bock]

Hi Andrei,

ok, i will do.

Carsten

2010/8/31 Andrei Pelinescu-Onciul <andrei at iptel.org>:
> On Aug 30, 2010 at 17:14, Carsten Bock <carsten at bock.info> wrote:
>> Module: sip-router
>> Branch: carstenbock/rtpproxy
>> Commit: 5415f157c5b561b03a1be5bfe5f96d68f2bb1838
>> URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5415f157c5b561b03a1be5bfe5f96d68f2bb1838
>>
>> Author: Carsten Bock <lists at bock.info>
>> Committer: Carsten Bock <lists at bock.info>
>> Date:   Mon Aug 30 16:26:05 2010 +0200
>>
>> Merge branch 'master' into rtpproxy
>
>
> In the future please avoid merging master into your branch, unless
> absolutely necessary (e.g. you depend on some changes made on master).
> It will create confusing log messages later when/if will be merged into
> master.
>
> Andrei
>
> _______________________________________________
> sr-dev mailing list
> sr-dev at lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
>