]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorSimon Morlat <simon.morlat@linphone.org>
Mon, 29 Nov 2010 14:40:47 +0000 (15:40 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Mon, 29 Nov 2010 14:40:47 +0000 (15:40 +0100)

Trivial merge