2 commits

Author	SHA1	Message	Date
Simon Morlat	3f8969c949	Merge remote-tracking branch 'linphone/master' ... Conflicts: Makefile.am	2013-01-14 16:38:24 +01:00
Simon Morlat	2c5601b0f2	add missing files	2012-12-12 14:10:20 +01:00