Merge branch 'master' into topic/jsiwek/faster-val-clone

CHANGES

@@ -1,4 +1,9 @@
 
+2.2-244 | 2014-03-17 08:24:17 -0700
+
+  * Fix compile errror on FreeBSD caused by wrong include file order.
+    (Bernhard Amann)
+
 2.2-240 | 2014-03-14 10:23:54 -0700
 
   * Derive results of DNS lookups from from input when in BRO_DNS_FAKE

VERSION

@@ -1 +1 @@
-2.2-240
+2.2-244

aux/broctl

@@ -1 +1 @@
-Subproject commit 756eb3e5bd63a830cfb0fab3ab6a41115f02c05b
+Subproject commit f8273c9eb5db1168c21b298cd3af4f9b4b008717

src/threading/formatters/JSON.cc

@@ -2,18 +2,17 @@
 
 #include "config.h"
 
-#include <sstream>
-#include <errno.h>
-#include <math.h>
-
-#include "./JSON.h"
-
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
 #endif
 
+#include <sstream>
+#include <errno.h>
+#include <math.h>
 #include <stdint.h>
 
+#include "./JSON.h"
+
 using namespace threading::formatter;
 
 JSON::JSON(MsgThread* t, TimeFormat tf) : Formatter(t)