From 2add60b4b140f99d246c03c5e344a1eb2ba8e1fb Mon Sep 17 00:00:00 2001
From: Seth Hall <seth@icir.org>
Date: Wed, 28 Nov 2012 15:22:45 -0500
Subject: [PATCH] A function wasn't returning a value like it should be.

---
 scripts/base/utils/queue.bro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/base/utils/queue.bro b/scripts/base/utils/queue.bro
index c5e3bcf906..438529f579 100644
--- a/scripts/base/utils/queue.bro
+++ b/scripts/base/utils/queue.bro
@@ -126,6 +126,7 @@ function merge(q1: Queue, q2: Queue): Queue
 		++i;
 		++j;
 		}
+	return ret;
 	}
 
 function len(q: Queue): count