Merge branch 'master' into xtuple
commitcc86a27fb34aa900f4a8c310a00e84efc7220ae9
authorJan Kundrát <jkt@flaska.net>
Thu, 8 Nov 2012 16:21:37 +0000 (8 17:21 +0100)
committerJan Kundrát <jkt@flaska.net>
Thu, 8 Nov 2012 16:21:37 +0000 (8 17:21 +0100)
tree1bc2b878a04b179db12836def38bb56fb3bb2e21
parentd115f498e6a621db783b2ddbb05890f81a5b902f
parent136b254b54a37f906a2229a4af492d4b5c0a8755
Merge branch 'master' into xtuple
src/Gui/Window.cpp
src/Imap/Model/Model.cpp