[geary/wip/725929-db-opt: 5/5] Merge branch 'master' into wip/725929-db-opt

[Charles Lindsay <clindsay src gnome org>]

commit 2bc03bf3292ab744e54f38ff9a8ec3d32e9d105c
Merge: 3c2f36d ccfd1f0
Author: Charles Lindsay <chaz yorba org>
Date:   Wed Mar 12 12:18:36 2014 -0700

    Merge branch 'master' into wip/725929-db-opt

 help/C/accounts.page                               |   19 +++++++-
 help/C/archive.page                                |    9 ++--
 help/C/bugs.page                                   |   13 ++++-
 help/C/limits.page                                 |    2 +-
 help/C/overview.page                               |    4 +-
 help/C/preferences.page                            |    2 +-
 help/C/search.page                                 |   40 ++++++++++++++++-
 help/C/shortcuts.page                              |    3 +-
 .../abstract/geary-abstract-local-folder.vala      |    4 ++
 src/engine/api/geary-search-folder.vala            |    2 +
 src/engine/imap-db/outbox/smtp-outbox-folder.vala  |    2 +
 .../imap-engine/imap-engine-generic-account.vala   |   48 ++++++++++++-------
 theming/message-viewer.css                         |    1 -
 13 files changed, 115 insertions(+), 34 deletions(-)
---