]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.linphone.org:linphone into dev_gtk_new_ui
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 3 Jan 2013 08:41:06 +0000 (09:41 +0100)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 3 Jan 2013 08:41:06 +0000 (09:41 +0100)

Trivial merge