Indent.
Merge branch 'master' into event-notifications

Conflicts:
	src/plugins/WebOfTrust/WebOfTrust.java