Merge remote-tracking branch 'kicad/master'

Conflicts:
	library/device.lib
This commit is contained in:
Oliver Walters 2016-02-24 13:39:40 +11:00
commit 733a1ad8af

File diff suppressed because it is too large Load diff