2. Tails
3. wiki/src/index.*.po
4. Changes

Removing wiki/src/torrents/files/tails-i386-1.7~rc1.iso.sig
Auto-merging wiki/src/torrents/files/tails-i386-1.7.packages
Removing wiki/src/torrents/files/tails-i386-1.6.torrent.sig
Removing wiki/src/torrents/files/tails-i386-1.6.torrent
Removing wiki/src/torrents/files/tails-i386-1.6.iso.sig
Auto-merging wiki/src/install/inc/tails-installation-assistant.inline.pt.po
Auto-merging wiki/src/install/inc/tails-installation-assistant.inline.fr.po
Auto-merging wiki/src/install/inc/tails-installation-assistant.inline.de.po
Auto-merging wiki/src/install/inc/overview/vm.de.po
Removing wiki/src/inc/stable_i386_iso_size_mib_unit.pt.po
Removing wiki/src/inc/stable_i386_iso_size_mib_unit.mdwn
Removing wiki/src/inc/stable_i386_iso_size_mib_unit.fr.po
Removing wiki/src/inc/stable_i386_iso_size_mib.mdwn
Removing wiki/src/inc/stable_i386_iso_size_mb_unit.mdwn
Removing wiki/src/inc/stable_i386_iso_size_mb.mdwn
Removing wiki/src/doc/first_steps/upgrade.release_notes.pt.po
Removing wiki/src/doc/first_steps/upgrade.release_notes.html
Removing wiki/src/doc/first_steps/upgrade.release_notes.fr.po
Removing wiki/src/doc/first_steps/upgrade.release_notes.de.po
Auto-merging wiki/src/doc/first_steps/upgrade.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po
Auto-merging wiki/src/doc/first_steps/start_tails.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po
Auto-merging wiki/src/doc/first_steps/installation/manual/windows.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/windows.de.po
Auto-merging wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.de.po
Auto-merging wiki/src/doc/anonymous_internet/vidalia.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/vidalia.de.po
Removing wiki/src/doc/anonymous_internet/thunderbird.pt.po
Removing wiki/src/doc/anonymous_internet/thunderbird.mdwn
Removing wiki/src/doc/anonymous_internet/thunderbird.fr.po
Removing wiki/src/doc/anonymous_internet/thunderbird.de.po
Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po
Auto-merging wiki/src/doc/about/features.fr.po
Auto-merging wiki/src/doc/about/features.de.po
Removing wiki/src/blueprint/bootstrapping/assistant/tails_installer.png
Removing features/images/UnsafeBrowserAddressBar.png
Removing config/chroot_local-includes/usr/local/bin/wget
Automatic merge failed; fix conflicts and then commit the result. (1)

Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Auto-merging wiki/src/doc/first_steps/start_tails.de.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po
Auto-merging wiki/src/doc/encryption_and_privacy/keyringer.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/keyringer.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)