]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git://git.linphone.org/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 23 Nov 2011 21:19:05 +0000 (22:19 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 23 Nov 2011 21:19:05 +0000 (22:19 +0100)

Trivial merge