IBNobody ec62d9e85c Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h
2016-03-22 20:39:05 -05:00
..
2016-01-20 00:06:52 -05:00
2016-01-20 00:06:52 -05:00
2016-01-20 00:06:52 -05:00
2016-01-11 16:53:33 -05:00
2016-01-15 23:10:30 -05:00
2016-03-15 23:52:51 -05:00
2016-01-24 17:19:33 -08:00
2016-01-24 17:19:33 -08:00
2016-01-11 16:53:33 -05:00