Commit the word before sync with master
Correct calendar Week/Month View event creation on double-click

Wrong parameters had been passed into the created function, causing
incorrect behaviour with event time rounding for the past times.
GSettings Bindings rely on quarks

There is a fake change notify on timezone when either a corresponding
file changes or the setting for "use system timezone" changes,
to propagate the change in the code properly. This notify requires
proper key identification for GSettings bindings, because without it
the binding crashes on a runtime check.
Updated Spanish translation
Updated Spanish Translation
Updated Norwegian bokmål translation.
Commit initial Catalan help translation
EHTMLEditorView - Improve detection of written e-mail addresses
tests: contact editor: update lookup for email fields
tests: contact editor: don't collapse sections
Added Norwegian bokmål translation from Åka Sikrom.
Updated Portuguese translation
Updated Norwegian bokmål translation.
Bug 709187 - Add an option to allow Expunge in vFolders
Updated Spanish translation
Bug 700778 - Correct TNEF mime type definition typo
Bug 736947 - Attachment icon not shown in Sent folder
Bug 736950 - Message with empty body and attachment shows body as attachment.dat
EHTMLEditorView - Get rid of GdkKeyEvent and use boolean flags instead.

This is mainly for WebKit2 port.
EHTMLEditorView - Remove unwanted attributes from HTML, HEAD and BODY elements when converting from HTML to plain text message