Merge pull request #1 from jackhumbert/master

Update

Merge pull request #605 from kuel/master

Add keymap_cyrillic.h, lots of cyrillic characters

Merge pull request #599 from Depariel/master

Fixed compiling errors and updated keymaps for infinity_chibios

Merge pull request #561 from 0xdec/patch-1

Clean up formatting & tiny refactor in rgblight.c

Add keymap_cyrillic.h, lots of cyrillic characters

Merge pull request #592 from sethbc/ez-sethbc

Ez sethbc

Merge pull request #593 from J3RN/master

Updated the J3RN ErgoDox keymap

Merge pull request #600 from adiabatic/master

zweihander-osx: add left-hand-thumb tab key

correct file name

fix mkdir cmd

Updates ErgoDox readme

automatically forward ergodox ez

Merge pull request #597 from Jiehong/feature/basic_keyboard_doc

feature: add basic doc about how a keyboard works on USB

Merge pull request #596 from fredizzimo/rid_of_quick

Fix the makefile dependencies and remove quick targets

added support for Infinity 1.1a (4th drop) matrix, no LED support yet

Thumb ⌫ into ⇥, numpad & into :, yank home/end

Also: add (back?) in the light-shine disabler

Remove /keyboard/* files

Merge branch 'master' of github.com:jackhumbert/qmk_firmware

# Conflicts:
#	keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
#	keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex

fixed typo in hasu/keymap.c

fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel keymap