]> sjero.net Git - linphone/commit
Merge branch 'master' into dev_sal
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 28 Jan 2010 10:41:44 +0000 (11:41 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 28 Jan 2010 10:41:44 +0000 (11:41 +0100)
commit92f082ab044a8b39c11b23fb03c5829b49d45010
treea36c40e0d939640f7fdbf591d7073a3248f6e928
parent907cd9a43b8d2980bdf58c46d941f6492d29838a
parent857722d3b552304c309e8653f4f6836d0bdbedfe
Merge branch 'master' into dev_sal

Conflicts:
po/ru.po