]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone-private
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 27 Apr 2010 12:41:20 +0000 (14:41 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 27 Apr 2010 12:41:20 +0000 (14:41 +0200)

Trivial merge