4 files changed, 8 insertions, 2 deletions

diff --git a/contrib/gana b/contrib/gana
-Subproject 9eddc2cf7b65bb43d285c75ef22fd9bc9cc7020
+Subproject 0ff4edfe76be77a59d4ebff5031feb50f3ba07d
diff --git a/contrib/handbook b/contrib/handbook
-Subproject e5b42badb7450aee5367e70294a0f8b1595945e
+Subproject 5c20e0aaa95c7cebc225d02231221d18fdcbdb5
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index c3204026b..203976b5c 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -142,7 +142,13 @@ GNUNET_JSON_parse (const json_t *root,
 
 /**
  * Frees all elements allocated during a #GNUNET_JSON_parse()
- * operation.
+ * operation.  Convenience function to be called if cleaning
+ * up all heap-allocated data from a #GNUNET_JSON_parse() is
+ * desired. The function does not have to be called if no data
+ * was heap-allocated (e.g. only integers, strings and fixed-sized
+ * data was used), or if the application calls the respective
+ * code to free the heap (not always #GNUNET_free(), depends
+ * on the data type!) on the returned heap-allocated data itself.
  *
  * @param spec specification of the parse operation
  */
diff --git a/src/service/testing/Makefile.am b/src/service/testing/Makefile.am
index 3bad23f95..5cd4aae9b 100644
--- a/src/service/testing/Makefile.am
+++ b/src/service/testing/Makefile.am
@@ -96,7 +96,7 @@ test_testing_start_with_config_SOURCES = \
 test_testing_start_with_config_LDADD = \
  libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/hello/libgnunethello.la 
+ $(top_builddir)/src/lib/hello/libgnunethello.la
 
 test_testing_portreservation_SOURCES = \
  test_testing_portreservation.c