]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 16 Jan 2013 14:50:27 +0000 (15:50 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 16 Jan 2013 14:50:27 +0000 (15:50 +0100)

Trivial merge