John Lewin 4fd2eee3c7 Merge remote-tracking branch 'origin/1.5.3' ... # Conflicts: # PrinterCommunication/Io/WaitForTempStream.cs		2016-05-19 18:03:57 -07:00
..
Io	Merge remote-tracking branch 'origin/1.5.3'	2016-05-19 18:03:57 -07:00
PrinterConnectionAndCommunication.cs	Add support for renaming and duplicating presets	2016-05-16 17:46:17 -07:00