Commit a0f13ffaeecc6d6958e9321473e621db3b6d57eb

nulltoken 2013-11-15T14:32:52

Add missing mappings to .mailmap file