From: Erez Zukerman <ezuk@madmimi.com>
Date: Tue, 10 Nov 2015 02:40:52 +0000 (+0200)
Subject: Merge branch 'master' of github.com:jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ea44ac4a622329f719ff82497fb47c9d3f623364;p=qmk_firmware.git

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

Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c
---

ea44ac4a622329f719ff82497fb47c9d3f623364