escape @ characters properly so they show up
Merge branch 'next' of github.com:ledger/ledger into next