Merge branch 'replying'
commit9a77b3d4a78f54c96b9b28d1ec7cc00ee4c05ed1
authorJan Kundrát <jkt@flaska.net>
Sat, 5 Jan 2013 15:01:15 +0000 (5 16:01 +0100)
committerJan Kundrát <jkt@flaska.net>
Sat, 5 Jan 2013 15:01:15 +0000 (5 16:01 +0100)
tree9f6cf1aa92315b2797005df614dd65b61078681d
parent9ba2a9744649a9959b1cb20dc18490eac63252df
parent37ab9fcd5c086c1ebb44ee9004c872fc892bcc62
Merge branch 'replying'

fixes #569
src/Gui/ComposeWidget.cpp
tests/tests/test_Imap_Tasks_OpenConnection/test_Imap_Tasks_OpenConnection.cpp