]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git://git.linphone.org/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 17 Apr 2012 16:05:54 +0000 (18:05 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 17 Apr 2012 16:05:54 +0000 (18:05 +0200)

Trivial merge