[empathy: 55/55] Merge branch 'mallard-to-merge'

[Frederic Peters <fpeters src gnome org>]

commit 1a4735d843a9d2757d73cdce9b0c2a0a2fb9d1b1
Merge: 03480a1... 553761a...
Author: Frédéric Péters <fpeters 0d be>
Date:   Wed Aug 12 18:40:34 2009 +0200

    Merge branch 'mallard-to-merge'

 help/.gitignore                           |   11 +
 help/C/add-account.page                   |   94 ++
 help/C/add-contact.page                   |   69 ++
 help/C/audio-call.page                    |   59 ++
 help/C/audio-video.page                   |   69 ++
 help/C/change-status.page                 |   51 ++
 help/C/create-account.page                |  137 +++
 help/C/disable-account.page               |   66 ++
 help/C/empathy.xml                        | 1395 -----------------------------
 help/C/figures/audio-input-microphone.png |  Bin 0 -> 650 bytes
 help/C/figures/available.png              |  Bin 0 -> 689 bytes
 help/C/figures/away.png                   |  Bin 0 -> 538 bytes
 help/C/figures/busy.png                   |  Bin 0 -> 616 bytes
 help/C/figures/camera-web.png             |  Bin 0 -> 881 bytes
 help/C/figures/extended-away.png          |  Bin 0 -> 752 bytes
 help/C/group-conversations.page           |   15 +
 help/C/index.page                         |   43 +
 help/C/irc-account.page                   |  128 +++
 help/C/irc-join-pwd.page                  |   29 +
 help/C/irc-join-room.page                 |   55 ++
 help/C/irc-manage.page                    |   43 +
 help/C/irc-nick-password.page             |   92 ++
 help/C/legal.xml                          |   85 +--
 help/C/offline-contacts.page              |   59 ++
 help/C/prob-conn-acctdisabled.page        |   51 ++
 help/C/prob-conn-auth.page                |   62 ++
 help/C/prob-conn-name.page                |   59 ++
 help/C/prob-conn-neterror.page            |   67 ++
 help/C/prob-conn.page                     |   44 +
 help/C/remove-account.page                |   70 ++
 help/C/salut-protocol.page                |   52 ++
 help/C/send-file.page                     |   90 ++
 help/C/send-message.page                  |   52 ++
 help/C/set-custom-status.page             |  163 ++++
 help/C/share-desktop.page                 |   86 ++
 help/C/status-icons.page                  |  108 +++
 help/C/video-call.page                    |   59 ++
 help/Makefile.am                          |   44 +-
 38 files changed, 2033 insertions(+), 1474 deletions(-)
---