v0.2 changelog and version bump
Merge branch 'master' into v0.2

Conflicts:
	readme.txt
Merge pull request #77 from fxbenard/master

[i18n]> French and pot update for v.0.2
Use wp_safe_redirect instead of wp_redirect
Fix broken link on compare fork screen

On this screen, the $post global is null. I assume the intention is to
link back to the original pos.
Fork_Merge->merge() returns post ID, not post object.

Fork_Merge->merge() returns the value from wp_update_post(), which is
an integer (the post ID), not a post object
Merge pull request #78 from paulgibbs/redirects

Use wp_safe_redirect instead of wp_redirect
Merge pull request #79 from paulgibbs/admin_fixes

Fix broken link on compare fork screen
Merge pull request #80 from paulgibbs/intercept_publish_fix

Fork_Merge->merge() returns post ID, not post object.
Add test for preserving blank lines in a merge.
Normalize whitespace removes duplicate lines spaces, which is something that people need when using the HTML editor.  Instead of calling that, let's just trim the trailing white space. fixes #50
allow administrators and subscribers to delete there own fork #48

the capability is forks, not fork.  fixes
Merge pull request #85 from post-forking/fork-trashing

allow administrators and subscribers to delete there own fork #48
Merge pull request #81 from post-forking/bug-blank-lines

Fix blank lines being removed on merge
update changelog
update screenshots, fixes #56
Merge pull request #65 from post-forking/v0.2

Release new stable version
proper wp plugin header
whitespace in php header
Update tested version of 3.6 to 3.6.1