]> sjero.net Git - linphone/commit
Merge branch 'master' into tunnel
authorJehan Monnier <jehan.monnier@linphone.org>
Thu, 22 Dec 2011 13:02:05 +0000 (14:02 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Thu, 22 Dec 2011 13:02:05 +0000 (14:02 +0100)
commitfdd53e63bce411157eba0f516f5f6acef9cb78b5
tree258e7f86580f5ac39a47014aa079ef0a735c695a
parentffa7c39d3cbdbadcfc514bcab4fb3c53959335e6
parent77cad2f045e1471d003c6bfb01ec87e19b1d86cc
Merge branch 'master' into tunnel