]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 4 Nov 2011 14:06:42 +0000 (15:06 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 4 Nov 2011 14:06:42 +0000 (15:06 +0100)

Trivial merge