Added nomodeline to vim command
Merge branch 'master' of github.com:agl/pond
Add OSX CLI install instructions to documentation.

Related to issue #116
cli: fix crash when viewing message from pending contact.

Fixes #114.
Merge pull request #110 from PiotrC/master

Add nomodeline to vim command
added timestamp to some client notfications
Merge pull request #117 from Miserlou/osx-cli-docs

Add OSX CLI install instructions to documentation.
Merge pull request #89 from duy/notifications-timestamp

added timestamp to some client notfications
Merge branch 'master' into merged
added installation instructions for Tails 1.1xX
Tails docs: replace aliases with wrapper scripts

also removed old Tails 1.0.1 documentation
show empty (ack) messages in outbox

so they can be deleted when DELIVERY_SIGNATURE_INVALID happens
Tails docs: add persistent aliases, other details