Merge pull request #288 from rgrinberg/master

Fix typo
changelog: backport from merlin1
changelog: reconstruct for v1.7.X
changelog: update for v2.0
Update TODO
Emacs23 is broken, don't use fringe
Emacs: remove obsolete aliases
Update changelog
Update README.md

Mention support of the custom_printf syntax extension
Merge pull request #301 from mmottl/master

Update README.md
Remove sed GNUism from configure [#300]

What a mess. I don't want to live on this planet anymore!
Trying to find an invocation of sed compatible with GNU and BSD
Allow comma-separated list of packages in merlin-use #299

`crm-default-separator` in reality, not just comma.
It seems to bug when using " " as separator.
Protocol: tell file contents, needed to implement #232
Resync parser
Location: error.loc label to err_loc to prevent ambiguity with t.loc
Port exception_registration branch to 4.00
Port exception_registration branch to 4.01
Uniformize error reporting
Factor out Error_report