From: Jose Dapena Paz <jdapena@igalia.com>
Date: Tue, 16 Jun 2009 16:09:43 +0000 (+0200)
Subject: Rebasing master into fast-dbus-open-message
X-Git-Tag: 3.0.17-rc16~1
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=510590f52651569cdb510f4a568e1a18e637bd0e;hp=ceb44609ce092fb7d12bfcec333a816d4a1d02b2

Rebasing master into fast-dbus-open-message

Conflicts:
	debian/changelog
---