]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 2 Dec 2011 17:14:05 +0000 (18:14 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 2 Dec 2011 17:14:05 +0000 (18:14 +0100)

Trivial merge