merge conflict resolution

diff --cc src/namestore/gnunet-zoneimport.c
index a01772e678961028a836f6991518fe201889baac,89afeeeb19e3a42e374543a5456488b3ff2df866..2926fe9bd6c5b17e9c25f43c36da7cb77d153858
--- 1/src/namestore/gnunet-zoneimport.c
--- 2/src/namestore/gnunet-zoneimport.c
+++ b/src/namestore/gnunet-zoneimport.c
@@@ -799,8 -786,8 +791,9 @@@ store_completed_cb (void *cls
                    int32_t success,
                    const char *emsg)
  {
 +  static unsigned int pdot;
    struct Request *req = cls;
+   struct Record *rec;
  
    req->qe = NULL;
    pending--;
@@@ -816,10 -803,15 +809,18 @@@
      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                "Stored records under `%s'\n",
                req->label);
 +    pdot++;
 +    if (0 == pdot % 1000)
 +      fprintf (stderr, ".");
    }
+   /* Free records */
+   while (NULL != (rec = req->rec_head))
+   {
+     GNUNET_CONTAINER_DLL_remove (req->rec_head,
+                                req->rec_tail,
+                                rec);
+     GNUNET_free (rec);
+   }
  }
  
  
@@@ -1176,9 -1125,8 +1166,9 @@@ ns_lookup_result_cb (void *cls
                     const struct GNUNET_GNSRECORD_Data *rd)
  {
    struct Request *req = cls;
-   
+ 
    req->qe = NULL;
 +  pending--;
    GNUNET_break (0 == memcmp (zone,
                             &req->zone->key,
                             sizeof (*zone)));