Commit 796b03bd4969f170d8e7a7c9edd567f636b58cb3

Edward Thomson 2014-10-03T20:47:48

rebase: clean up some warnings and memory leaks