Merge branch 'devel' into feature/create-additional-software-config
additional software: do not crash when tails is used without persistence

Before this, tails-additional-software crashed if there was no
persistent volume activated. It now exits gracefully.
Fetch poedit from squeeze-backports-sloppy.

Note: this commit alone actually won't trigger the intended effect until we drop
our own poedit package from deb.t.b.o.
Merge remote branch 'origin/devel' into feature/create-additional-software-config
Make it possible to manually start IBus.

By always exporting the environment variables it is
possible for the user to manually start IBus in any
locale using "System->Preferences->IBus Preferences".
IBus need to actually be started for the french
keyboard shortcuts bug to appear, so this is safe to do.

Also update the description for current behaviour.
Update design document for current IBus behaviour.
update I2P's site addresses

I2P's domains (internal and external) have recently changed with the
site refresh. Its new address is https://geti2p.net. http://www.i2p2.de
301 redirects to the new location.
simplified ports listing
Install Pidgin from squeeze-backports (Closes: #6661).
update internal I2P homepage address

Here the address in the bookmarks and release process test document is
updated.
Merge remote-tracking branch 'killyourtv/bugfix/new-i2p-site' into devel
Merge remote-tracking branch 'winterfairy/bugfix/allow-ibus-start' into devel
Merge branch 'feature/6661-pidgin-2.10.9' into devel
Merge branch 'feature/poedit-from-backports' into devel

Conflicts:
	config/chroot_apt/preferences
Merge branch 'feature/create-additional-software-config' into devel
Simplify Pidgin's APT pinning, now that our APT suite was cleaned up.
linux-kbuild-3.12 is not in sid anymore.
Disable the Intel Management Engine Interface driver.

It is only useful to take benefit from the integrated ME,
for out-of-band management, OS watchdog etc., which:

1. we don't care about in Tails
2. might be dangerous
3. causes bugs on various hardware (e.g. systems that reboot when asked to shut
   down)
Merge branch 'bugfix/linux-kbuild-3.12-from-testing' into devel
Merge branch 'feature/disable-mei' into devel