Commit 70b0f128c8f8a9f6bd2ec4ec0b326f8c03f9efb4

Jacques Germishuys 2015-03-17T16:34:36

Added changelog entries for whitespace and patience merges.