Lars Brubaker fb860d31f9 Merge branch '1.5.0' ... Conflicts: Submodules/MatterSlice		2016-02-04 10:17:02 -08:00
..
agg-sharp@9ef61224e9	Back to the 1.5 versions of agg and ms	2016-02-03 14:53:43 -08:00
MatterSlice@167e8233c0	Merge branch '1.5.0'	2016-02-04 10:17:02 -08:00