Files
jami-daemon/debian
Emmanuel Milou eab073e145 Merge branch 'stable' into pulseaudio
Conflicts:

	debian/changelog
	debian/changelog.Debian.gz
	src/audio/audiortp.cpp
2008-06-12 09:56:30 -04:00
..
2008-05-26 17:27:54 -04:00
2008-05-23 09:32:44 -04:00
2008-05-26 17:27:54 -04:00
2008-05-22 16:23:43 -04:00
2008-05-26 17:27:54 -04:00
2008-05-26 17:27:54 -04:00
2008-05-23 09:47:24 -04:00
2008-05-26 17:27:54 -04:00
2008-05-26 17:27:54 -04:00