Conflicts:
	wiki/src/doc/about/warning.pt.po

i2p 0.9.13 has been imported into our APT repo.

Also see #7319 for why one of the images has the tail of a "g"
cropped.

Some applets, like window-picker-applet, seem to reset the height
setting when added.

Running `notify-send` as root doesn't show anything, so we fallback on
our reliable `tilas-notify-user` instead.

The Sikuli images are now updated for Wheezy.

The Sikuli images are now updated for Wheezy.

It has been reported that the old value sometimes fails for the
"Memory erasure on an old computer" scenario. 0.5% is still a clear
indication that significant wiping was successful. Also see #7313.

Sometimes Sikuli fails to find the shutdown icon in the shutdown
applet's menu (possibly because it's covered by a notification) so
that method isn't completely reliable at the moment. To contain this
problem we test the shutdown applet separately, and rely on the more
dependable remote shell for halting in the general case.

While we're at it we also make sure that the shutdown steps are
formulated so what they do is more explicit.

Conflicts:
	config/chroot_local-hooks/98-remove_unwanted_packages

Make Markdown more consistent: this will hopefully avoid re-introducing the same class of bugs fixed in the previous commit.