The word 'me' wasn't translation aware.

Conflicts:
	locale/converse.pot
Add new Makefile step "merge" and document it.
Regenerated docs
Merge new translations into the PO files
Bugfix. Messages were stored against buddy JID and not own JID
For uniqueness, we need both JIDs for messages localStorage Fixes #49
Bump version everywhere and regenerate docs.
Bump version and minimize files.
Bump version and minimize files.
Merge branch 'master' of github.com:jcbrand/converse.js
Correct version is 0.6.3
Merge branch 'master' into otr

Conflicts:
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
Remove messages from localStorage when calling /clear
We didn't have an icon for unavailable state.

Also, the status description was not translation aware
Regenerated PO and POT files
The xa chat state wasn't being handled properly
Update CHANGES.rst
Add a test for /clear functionality
Merge branch 'otr' into mockup