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

Trivial merge