From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 28 Jan 2010 10:41:44 +0000 (+0100)
Subject: Merge branch 'master' into dev_sal
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=92f082ab044a8b39c11b23fb03c5829b49d45010

Merge branch 'master' into dev_sal

Conflicts:
	po/ru.po
---

92f082ab044a8b39c11b23fb03c5829b49d45010