timestamp in erc should be readable
Merge branch 'master' into erc-timestamp
Merge pull request #154 from mpmiszczyk/org-mode-fixups

Small Org-mode fixups
Merge pull request #155 from impaktor/erc-timestamp

Erc timestamp
Merge branch 'master' of https://github.com/bbatsov/zenburn-emacs into develop