gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/02763674 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/cf1d51c3 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b60057db (commit)



commit 02763674615ff36292dff45e028ea570d10cdf74
Merge: b60057d cf1d51c
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jul 23 16:20:19 2017 -0700

    Merge Guido Falsi's 'fix-typo-and-indent' branch.


commit cf1d51c3a0bf780c845ca4f4fdf99c0f77bbac42
Author: Guido Falsi <mad at madpilot.net>
Date:   Mon Jul 10 17:36:12 2017 +0200

    Fix a typo in a comment, and indentition of if conditional content.

diff --git a/src/import-export/ofx/gnc-ofx-import.c b/src/import-export/ofx/gnc-ofx-import.c
index da6a479..08fc2b9 100644
--- a/src/import-export/ofx/gnc-ofx-import.c
+++ b/src/import-export/ofx/gnc-ofx-import.c
@@ -328,7 +328,7 @@ static Account *gnc_ofx_new_account(const char* name,
 /* LibOFX has a daylight time handling bug,
  * https://sourceforge.net/p/libofx/bugs/39/, which causes it to adjust the
  * timestamp for daylight time even when daylight time is not in
- * effect. HAvE_OFX_BUG_39 reflects the result of checking for this bug during
+ * effect. HAVE_OFX_BUG_39 reflects the result of checking for this bug during
  * configuration, and fix_ofx_bug_39() corrects for it.
  */
 static time64
@@ -338,7 +338,7 @@ fix_ofx_bug_39 (time64 t)
     struct tm stm;
     gnc_localtime_r(&t, &stm);
     if (daylight && !stm.tm_isdst)
-      t += 3600;
+        t += 3600;
 #endif
     return t;
 }



Summary of changes:
 src/import-export/ofx/gnc-ofx-import.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)