]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git://git.linphone.org/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Mon, 21 Nov 2011 13:58:29 +0000 (14:58 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Mon, 21 Nov 2011 13:58:29 +0000 (14:58 +0100)

Trivial merge