]> sjero.net Git - linphone/commit - coreapi/conference.c
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 21 Oct 2011 09:55:19 +0000 (11:55 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 21 Oct 2011 09:55:19 +0000 (11:55 +0200)
commit7f7ee739c2ab77a16774ba8368d3da7d9bf5617d
tree84c9014ed2b8fddc0fb4609d26022da21f4f7a12
parent053205bcb0695e96505d4118a1ca51db8f455aa3
parentee341e2ec393e1abefc7f05969b47370fd2c68de
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone