gnucash master: Multiple changes pushed

[John Ralls]

> On Oct 9, 2016, at 6:48 PM, Geert Janssens <geert.gnucash at kobaltwit.be> wrote:
> 
> On Sunday 09 October 2016 04:54:11 John Ralls wrote:
>> Updated	 via  https://github.com/Gnucash/gnucash/commit/20c0271e
>> (commit) via  https://github.com/Gnucash/gnucash/commit/b00694fd
>> (commit) from  https://github.com/Gnucash/gnucash/commit/6e132d83
>> (commit)
>> 
>> 
>> 
>> commit 20c0271e985cfe711e0edf9bd89c1e06efc6db15
>> Author: John Ralls <jralls at ceridwen.us>
>> Date:   Tue Oct 4 20:00:48 2016 +0200
>> 
>>    Fix CSV importer to handle GMT + 13 Timezone (New Zealand Daylight
>> Time).
>> 
>>    Also remove special time calculations and use
>> gnc_dmy2timespec_neutral() for consistency with rest of GnuCash.
>> 
>> commit b00694fde4148417813e36502ca6a68dba66454e
>> Author: John Ralls <jralls at ceridwen.us>
>> Date:   Tue Oct 4 19:59:00 2016 +0200
>> 
>>    Bug 772382 - Date off-by-one after DST change
>> 
>>    The time needs to be 10:59, not 11:00: 13 hours after 11:00 is
>> 24:00, which is really 00:00 the next day.
> 
> These commits were previously pushed on maint as well earlier this week. 
> However they seem to be cherry-picked to master instead of merged. At 
> least I don't see a merge commit. Is there a particular reason for this 

Darn. I didn't notice that. Sorry.

What happened is that I did a merge and was working on fixing the conflicts and getting the tests to pass; in the meantime Christian pushed 6e132d8 so I did a pull--rebase, which of course replaced the merge with new commits. At least it didn't replay a bunch of history.

Regards,
John Ralls