xbmc/xbmc — pull request #5600 by koying (2014-10-29 13:56:59+00:00)
Title: fixup 5f5d8c86490510f49b82d05ff16011bfbf4cbfa8; re-add default joystick map

@topfs2 fixup from the obb commit :(