Build 1.99.2.
authorGerald Combs <gerald@wireshark.org>
Wed, 4 Feb 2015 19:01:58 +0000 (11:01 -0800)
committerGerald Combs <gerald@wireshark.org>
Wed, 4 Feb 2015 19:03:39 +0000 (19:03 +0000)
Change-Id: If4a4fb9009da61bd67a8577f17c9e0dedcb6de6d
Reviewed-on: https://code.wireshark.org/review/6955
Reviewed-by: Gerald Combs <gerald@wireshark.org>
ChangeLog
NEWS
make-version.pl

index a1bfdcf073de912808872a38ff0d299f5aad701a..964657afeb8b1283f542267970ce2c19d44e3c4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
-commit a971768
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Dec 8 21:40:24 2014 -0500
+commit a748e83
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Feb 4 08:53:44 2015 -0800
 
-    Refactor "color" conversation filters
+    Qt: Add "Copy As..." to the Protocol Hierarchy stats.
     
-    Have dissectors register their desire to be part of "color" conversation filters and have the GUI use that registered list.  GUI actually using API will come in a separate commit.
+    This implementation is slightly different compared to other dialogs
+    since we have nested items.
     
-    Change-Id: I5ffe922d97894fe7bf3182056b76ab5839a9461a
-    Reviewed-on: https://code.wireshark.org/review/5658
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tweak the bar highlight color look better on Windows while we're here.
+    
+    Change-Id: If0607c4624f304042fe3d6c8a941756b342e703d
+    Reviewed-on: https://code.wireshark.org/review/6953
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit a8cc331
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Feb 4 09:44:40 2015 -0800
+
+    Update the release notes.
+    
+    Change-Id: Id4fc195e54dba19f697d20d2085f2e1f922c8ced
+    Reviewed-on: https://code.wireshark.org/review/6954
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit febc842
+Author: Evan Huus <eapache@gmail.com>
+Date:   Wed Feb 4 10:02:41 2015 -0500
+
+    Update README.wmem, release notes for emem removal
+    
+    Change-Id: Iac5066ff97d26de1660c38b9cd3f17781a521823
+    Reviewed-on: https://code.wireshark.org/review/6949
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+
+commit 150dd22
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Feb 4 15:55:05 2015 +0100
+
+    [INAP] Make INAP a new style dissector and add an OID dissector for
+    0.4.0.1.1.1.0.0 cs1-ssp-to-scp.
+    
+    Change-Id: Ib7261ef199d7a3aedaed14e7f869af8b64c21c92
+    Reviewed-on: https://code.wireshark.org/review/6948
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e050ad2
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Dec 6 15:39:26 2014 -0500
+commit d9e82b7
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Feb 4 14:04:27 2015 +0100
 
-    Eliminate some proto_tree_add_text in packet-bgp.c
+    [INAP] Add dissection of Cause
+    Ping-Bug:10910
+    Change-Id: I131d81b0d6332cc72e7b32dc81cb7fec4ca3d407
+    Reviewed-on: https://code.wireshark.org/review/6947
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 0a6d1f9
+Author: gal <graeme.lunt@smhs.co.uk>
+Date:   Tue Feb 3 15:55:05 2015 +0000
+
+    Support for P3 over RTSE.
+    
+    Resolve mixed space/tab issue in the RTSE and BER dissectors and included modelines in both templates.
     
-    Change-Id: I05fabe9786125e2167fe4010733f61000d0e7914
-    Reviewed-on: https://code.wireshark.org/review/5670
+    Change-Id: I4b75bad94ed111d0faee205e026b2322b7dafbd1
+    Reviewed-on: https://code.wireshark.org/review/6932
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Matthieu Texier <matthieu@texier.tv>
+
+commit 9875181
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Feb 4 13:24:57 2015 +0100
+
+    [CAMEL] Dissect additionalCallingPartyNumber.
+    Ping-Bug: 10914
+    Change-Id: I28eb9d7b5192a02f82fe604d20e57aedd706f528
+    Reviewed-on: https://code.wireshark.org/review/6946
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 94011c1
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Wed Feb 4 09:52:54 2015 +0100
+
+    [QNET6] Try to fix solaris buildboot.
+    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index' may be used uninitialized in this function
+    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index' was declared here
+    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index_off' may be used uninitialized in this function
+    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index_off' was declared here
+    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1500: warning: 'sstree' may be used uninitialized in this function
+    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1500: note: 'sstree' was declared here
+    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index_len' may be used uninitialized in this function
+    /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index_len' was declared here
+    
+    Remove not needed includes.
+    
+    Change-Id: Iac91954b3d6c8f9799c6fe816af93376419d1b21
+    Reviewed-on: https://code.wireshark.org/review/6945
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d4476b1
+commit 9f78bf6
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 10 00:39:13 2014 -0800
+Date:   Tue Feb 3 23:39:05 2015 -0800
 
-    Expose find_heur_dissector_list().
+    Use QNX_PC_ for QNX's pathconf parameter values.
     
-    We already have find_dissector_table(); expose
-    find_heur_dissector_list() as well, so that heuristic dissector lists
-    can be shared.
+    The numerical values are platform-specific, so call them QNX_PC_; that
+    also avoids collision with the values on the platform on which we're
+    building Wireshark (such a collision broke the Solaris build).
     
-    Change-Id: I3f50413b8b10fd3129fcdc2344cb1447f0946ce9
-    Reviewed-on: https://code.wireshark.org/review/5701
+    Change-Id: I04291eccb818a290eb44eadb17a56ed684285a70
+    Reviewed-on: https://code.wireshark.org/review/6944
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit bd8d2f5
-Author: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date:   Wed Dec 10 04:19:55 2014 +0300
+commit f2cb59a
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Jun 17 17:03:11 2014 +0200
 
-    packet-couchbase.c: dissect more DCP commands
+    Add QNX' QNET protocol
     
-    Change-Id: I0e06c89cdda3c1f8e98412fd20737ff6afd26666
-    Reviewed-on: https://code.wireshark.org/review/5694
-    Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
+    no ethertype 0x8203-0x8205 support in trunk.
+    0x8204 is QNX OS VER 6's qnet ethernet protocol number.
+    
+    Bug:3934
+    Change-Id: I52555b568c3a304f1512fe25f949330b46f49a93
+    Reviewed-on: https://code.wireshark.org/review/6363
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 0f353c9
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jan 8 17:35:58 2015 +0100
+
+    HTTP2: Add tap for HTTP2 dissector
+    
+    Change-Id: Ib13d9391b64dad19321a4399c95b95d7fb791284
+    Reviewed-on: https://code.wireshark.org/review/6421
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit ef929ad
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Feb 3 18:02:29 2015 -0500
+
+    TOS-specific forwarding blocks aren't actually required: don't warn when they
+    aren't present.  Only warn if no forwarding blocks are present.
+    
+    Simplify the code a bit while also removing a proto_tree_add_text().  (There
+    are a number of similar proto_tree_add_texts()s here.)
+    
+    Hang the "no forwarding blocks" expert info off the LSA item rather than off
+    the Metric.  The warning is about how much data is in the LSA--it has
+    nothing to do with the Metric.
+    
+    Ping-Bug: 6302
+    Change-Id: I1903ba5ad78101ec4fa2602a1f21e8192f1d8d53
+    Reviewed-on: https://code.wireshark.org/review/6943
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c46fa33
-Author: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date:   Thu Dec 4 13:22:22 2014 +0300
+commit 8efe6b7
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jan 28 17:59:48 2015 +0100
 
-    Riemann protocol dissector
+    RADIUS: Sync with FreeRADIUS Master
     
-    Homepage: http://riemann.io/
+    commit 852f15c72d41c637865776d5b80097e8ffbbb444
+    Author: Alan T. DeKok <aland@freeradius.org>
+    Date:   Mon Jan 26 13:08:21 2015 -0500
     
-    Sample capture:
-    http://files.avsej.net/riemann-sample.pcapng
+        As found on the net
     
-    Protocol definition:
-    https://github.com/aphyr/riemann-java-client/blob/master/src/main/proto/riemann/proto.proto
+    commit 53bf263d6ca9010acdc004bada894b1bfe0ed676
+    Author: Tobias Hachmer <tobias@hachmer.de>
+    Date:   Mon Jan 26 13:45:04 2015 +0100
     
-    Implementor's guide:
-    http://riemann.io/howto.html#write-a-client
+        add perle dictionary
     
-    Bug: 10758
-    Change-Id: I28634453423127fe647eb92e48072a90a7f5d232
-    Reviewed-on: https://code.wireshark.org/review/5620
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I15dd8705277f3a0cedd2ea12a7cac9974dadf3c0
+    Reviewed-on: https://code.wireshark.org/review/6835
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1f8b16e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 10 07:41:23 2014 +0100
+commit bee4fb0
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Feb 3 09:14:45 2015 +0100
 
-    ICQ: fix icq.meta_user.found_authorization field registration
+    CAPWAP: Use proto_tree_add_bitmask(_with_flags)
     
-    Change-Id: I8c39073b8d1237f8af7f7061f331b3d59ae81142
-    Reviewed-on: https://code.wireshark.org/review/5699
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I39ff2e15b91981111f8de091e6e5dfb7586b4599
+    Reviewed-on: https://code.wireshark.org/review/6937
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f64f7c6
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 10 07:37:23 2014 +0100
+commit 7ced085
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Feb 3 17:15:23 2015 -0500
 
-    NFS: do not duplicate field name in blurb
+    emem is dead! Long live wmem!
     
-    Change-Id: I565823e2ba3c712506710f911e118cd48c895523
-    Reviewed-on: https://code.wireshark.org/review/5698
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Iddd1200e62bf3200cb1a68408378dd9d47120b77
+    Reviewed-on: https://code.wireshark.org/review/6939
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4af7482
+commit 90a76e0
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Dec 6 12:57:33 2014 -0500
+Date:   Tue Feb 3 23:27:01 2015 -0500
 
-    Eliminate proto_tree_add_text from packet-icq.c
+    Convert val_to_str -> val_to_str_wmem.
+    
+    This is mostly for GUI usage, but a few dissectors needed some "non-packet scope" conversions.
     
-    Change-Id: I2f4bcd8c4a6cf534bb5b6b5c5aa7e21075968ee3
-    Reviewed-on: https://code.wireshark.org/review/5696
+    val_to_str officially now uses wmem_packet_scope()
+    
+    Change-Id: Ic9413eeb3406d7a7683222b86709f3675d628d81
+    Reviewed-on: https://code.wireshark.org/review/6933
     Reviewed-by: Michael Mann <mmann78@netscape.net>
     Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c449b43
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Dec 9 23:48:46 2014 -0500
+commit 74547db
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Feb 3 08:45:41 2015 +0100
 
-    nfs: expert...() shouldn't be called under 'if(tree)'
+    MySQL: Add Server ext caps and Auth Plugin Length to Server Greeting
     
-    Change-Id: I4f8c55ea4194d1246ea19368e0f5890ad1248f47
-    Reviewed-on: https://code.wireshark.org/review/5697
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Ping-Bug: 10346
+    Change-Id: I1b2bd3e9b1dc01118c48c6e159c9a06d4daa061b
+    Reviewed-on: https://code.wireshark.org/review/6936
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit dff05c9
-Author: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
-Date:   Sun Nov 9 10:58:43 2014 +0100
+commit c256bbe
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Feb 3 08:32:13 2015 +0100
 
-    nfs: decode dCache NFS file handle
+    MySQL: Use proto_tree_add_bitmask(with_flags)
     
-    add support for dCache NFS/pNFS
-    project page: http://www.dcache.org
+    Merge also mysql_dissect_caps_client and mysql_dissect_caps_server
+    and rename mysql_dissect_extcaps_client to mysql_dissect_extacps (it will be reused soon)
     
-    Bug: 10765
-    Change-Id: I24a88419ec070305e609d1b49b44994a464eb098
-    Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
-    Reviewed-on: https://code.wireshark.org/review/5236
+    Ping-Bug: 10346
+    Change-Id: I6543363a337d7bbfddba6dd699697a257a2cbb49
+    Reviewed-on: https://code.wireshark.org/review/6935
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8375a66
-Author: J. Bruce Fields <bfields@redhat.com>
-Date:   Thu Oct 30 14:53:07 2014 -0400
+commit 18bc353
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Feb 2 09:46:36 2015 +0100
 
-    nfs: fix failure to parse EXCHANGE_ID arguments
+    MySQL: Add support of AuthSwitchRequest/AuthSwitchResponse
+    
+    Bug: 10351
     
-    The exchange_id spo_must_enforce/spo_must_allow bitmaps are exceeding
-    this arbitrary MAX_BITMAPS constant, causing EXCHANGE_ID parsing to
-    fail.
+    Ping-Bug: 10346
+    
+    Change-Id: I730080a0aef293c3c8119f6c762ee246227bd07a
+    Reviewed-on: https://code.wireshark.org/review/6915
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Daniël van Eeden <wireshark@myname.nl>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 66fc81b
+Author: cbontje <cbontje@gmail.com>
+Date:   Mon Feb 2 10:09:58 2015 -0700
+
+    SEL Protocol Maintenance (1/2)
     
-    Even in the case of attributes we may need more than 4 words soon, even
-    if we don't I'm not sure if it's actually illegal to zero-pad them out
-    to something longer, and even if that is illegal I don't think it's
-    really helpful of wireshark to stop parsing.
+    - Clean up naming conventions & variables
+    - 'SEL Protocol' is the entire protocol suite
+    - 'Fast SER' is a function code of 'Fast Message' sub-type
     
-    Keep the constant just as a sanity check but make it really large.
+    'selfm' will remain the protocol name in Wireshark so no major architecture naming changes are anticipated
     
-    Ping-Bug: 10649
-    Change-Id: I3dff3ebde2d7f74f8cbe60a92c853463da66ae6a
-    Reviewed-on: https://code.wireshark.org/review/5144
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Idc5117dcede0b61c61c0c64d5cd20199535ed471
+    Reviewed-on: https://code.wireshark.org/review/6919
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e4b0141
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Dec 9 16:54:17 2014 -0800
+commit 9e1ddb5
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Feb 3 21:12:07 2015 -0500
 
-    Qt: Obey main toolbar icon preferences.
+    Only set HAVE_LUA if we, er, have Lua.
     
-    Remove the preferences for the filter toolbar and mark them GTK+-only.
+    Change-Id: Idb6f1dfa06c2b4e5d9e1f77743f13b4e0a6d8afe
+    Reviewed-on: https://code.wireshark.org/review/6942
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+
+commit 89e6f4c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Feb 3 08:39:14 2015 -0800
+
+    Qt: Add the Protocol Hierarchy statistics dialog.
     
-    Change-Id: Ie48b19aee29a1cfcea4c41ca6c08ddbba3102377
-    Reviewed-on: https://code.wireshark.org/review/5693
+    Change-Id: I6872e323daca4798c638d764873f54c4c0dc0006
+    Reviewed-on: https://code.wireshark.org/review/6934
     Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit c1d4a08
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 9 15:14:22 2014 -0800
+commit 342ba90
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Feb 3 17:13:49 2015 -0800
 
-    Add media playback icons.
+    Minor WSDG updates.
     
-    Change-Id: I5a9ba1314b0c93098e7b802618f73c7fca608b04
-    Reviewed-on: https://code.wireshark.org/review/5692
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I847af9ef7f18b271a5a2dc8da6c5817735a8c856
+    Reviewed-on: https://code.wireshark.org/review/6941
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 34cd063
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Dec 9 23:46:05 2014 +0100
+commit 4fe8ca0
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Fri Jan 23 07:36:50 2015 -0500
 
-    LTE RRC: upgrade dissector to v12.3.0
+    Simplify how we find Lua and expand the places we look.
     
-    Change-Id: Iac974bf505bed270fc1f9409a7d61c80ebca17a5
-    Reviewed-on: https://code.wireshark.org/review/5691
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    First, it appears some packagers actually ship a pkg-config file for Lua.
+    Try to use it.  (Unfortunately the package name varies so we have to try
+    several package names.)
+    
+    If that fails, try to find Lua directly, accounting for the various naming
+    conventions we've seen.
+    
+    Bug: 10475
+    Bug: 10572
+    Change-Id: I82e789c466a488dc12431cdd90c49b4c1052414a
+    Reviewed-on: https://code.wireshark.org/review/6756
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 4921e55
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Nov 18 16:21:42 2014 -0800
+commit 0e74e8b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Feb 3 16:25:01 2015 -0800
 
-    Qt: Initial VoIP Calls dialog.
+    Decorate declarations with G_GNUC_PRINTF() as appropriate.
     
-    Add Telephony menu items for VoIP Calls and SIP Flows. Put VoIP Calls at
-    the top, since that seems to be the primary item.
+    Decorate val_to_qstring() and val_ext_to_qstring() similarly to
+    val_to_str_wmem(); this squelches some compiler warnings.
+    
+    Change-Id: I86e102e7c0a1a135be9492b7d605001c5d922031
+    Reviewed-on: https://code.wireshark.org/review/6940
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit deabe64
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Feb 3 16:02:52 2015 -0800
+
+    Don't build app_bundle by default.
     
-    Add configure-time checks for QtMultimediaWidgets in anticipation of
-    adding a VoIP playback dialog.
+    As it turns out, building the app bundle makes wireshark-gtk unusable.
     
-    Add an icon for the playback button. (Yes, I've been avoiding
-    GNOME-level gratuitous icons so far but this is one of the rare
-    occiasions where it makes sense.)
+    Change-Id: Ic3608f0a485c3ec4ea21fbc2e7194553eda8c806
+    Reviewed-on: https://code.wireshark.org/review/6938
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit b8f040c
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Feb 2 10:37:17 2015 +0100
+
+    Dumpcap: avoid collecting stats on nf* interfaces.
     
-    Add a help link define for the VoIP calls dialog.
+    On Linux nf* interfaces don't collect stats properly and don't allows multiple connections.
     
-    Change-Id: I5d0799685c598ad9af76fe9667f8ea7d14b66050
-    Reviewed-on: https://code.wireshark.org/review/5674
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I69d8f343017d77bda313de7d2c501fab542f2e9b
+    Bug: 10886
+    Reviewed-on: https://code.wireshark.org/review/6796
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 3147087
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Dec 9 13:22:20 2014 -0800
+commit 9b22a2f
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jan 8 09:44:15 2015 +0100
 
-    Fix ranlib "has no symbols" errors in the codecs directory.
+    Updates in it translation.
     
-    Don't build the G.722 or G.726 codecs for now. Each are wrapped in
-    "#ifdef HAVE_SPANDSP", which we don't define.
+    This fixes also the "duplicate messages" error.
     
-    Conditionally compile the SBC codec.
+    Change-Id: Iec93d82d4776c4f9805c5bfa2b2453c22b0e24e8
+    Reviewed-on: https://code.wireshark.org/review/6929
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 33bdb21c
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Tue Feb 3 11:58:28 2015 -0500
+
+    xtp: Don't call col_...() under 'if (tree)'
     
-    Change-Id: I5f09ff66514f967d4f0611c943b4e6a975b8994b
-    Reviewed-on: https://code.wireshark.org/review/5690
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ie80476e919b5ba0a2e5f036c654a5379b91ddd32
+    Reviewed-on: https://code.wireshark.org/review/6931
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit f66de3a
+commit a2eec54
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Dec 9 11:24:59 2014 -0800
+Date:   Tue Feb 3 08:56:42 2015 -0800
 
-    Fix filename matching.
+    BT ATT: Fix what appears to be a value string mismatch.
     
-    Change-Id: I2bdfd3ad2798ed1443d06c42b05c9962b8e8041d
-    Reviewed-on: https://code.wireshark.org/review/5689
+    Change-Id: I440ed41c659bed9dcee43d8388ad780015971611
+    Reviewed-on: https://code.wireshark.org/review/6930
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit bcaa5d8
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Nov 12 14:24:16 2014 -0800
+commit b635997
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Feb 2 19:58:29 2015 -0500
 
-    Qt: Update and rename the summary dialog.
+    Convert val_to_str_ext -> val_to_str_ext_wmem for calls that don't have valid packet scope (GUI).
+    val_to_str_ext now officially uses wmem_packet_scope().
     
-    Go back to a single view similar to the GTK+ UI. Apply layouts using Qt
-    Designer.
+    Removed const from val_to_str[_ext]_wmem return value since it's not really constant.
     
-    Rename the menu item and class to "Capture File Properties". It's not
-    really a summary if it contains details such as "marked average bits
-    per second". We might want to move this to a "Properties" item under
-    the "File" menu similar to other applications.
+    Created utility functions in qt_ui_utils.h to help with the new memory management for its GUI.
+    
+    Change-Id: Idf2ce4a4ce78d628b2269ad23a3a48fbfc9c077c
+    Reviewed-on: https://code.wireshark.org/review/6926
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit e942973
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Jan 28 17:14:48 2015 +0100
+
+    Bluetooth/USB HID: Move boot form of reports from bthid to usbhid
     
-    Add the GTK+ summary icon (for now) to the toolbar and open the
-    properties dialog on clicking.
+    Then call it as new dissectors from bthid and btatt.
+    In future they will be used in usbhid, because they are part of HID.
     
-    Singleton dialogs delenda est[1]. Let the user open as many summaries on
-    as many capture files as he or she wishes. Also, global cfile delenda
-    est[2].
+    Change-Id: I9cb545f3079c27945b17bf8791ba4e3736c29e7c
+    Reviewed-on: https://code.wireshark.org/review/6912
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit 8417fbf
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Feb 2 23:51:36 2015 -0800
+
+    Initialize the entire UUID.
     
-    Don't blindly include QtGui. Add specific components instead.
+    Squelches a compiler warning.
     
-    Use consistent method names, variable names, and patterns. Try to
-    document what "consistent" means.
+    Change-Id: I050710dd296f7fe7d315f881b0edf43699d2fa91
+    Reviewed-on: https://code.wireshark.org/review/6928
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit ca3fe28
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Jan 7 12:16:15 2015 +0100
+
+    Bluetooth: ATT: Dissect almost all attributes
     
-    Adjust the way we display some statistics to match the summary bar, e.g.
-    displayed = captured if we don't have a filter applied.
+    Change-Id: Ia388c07150d9664327daf2d1990b4465b5f4ae28
+    Reviewed-on: https://code.wireshark.org/review/6910
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit 60b9be9
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Tue Jan 6 18:42:38 2015 +0100
+
+    Bluetooth: ATT: Dissect Read Multiple Response
     
-    [1] Not really.
-    [2] Yes, really.
+    Change-Id: Ifcbde05389901bd66355e42540f3850bfd55def5
+    Reviewed-on: https://code.wireshark.org/review/6909
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit db068ff
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Tue Jan 6 14:06:18 2015 +0100
+
+    Bluetooth: ATT: Decode some HOGP attributes
     
-    Change-Id: I11793b1d79dd0c3f70414ac8592b86181da59916
-    Reviewed-on: https://code.wireshark.org/review/5274
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I169f767b699a2f95e5a1553f1380f0b88cd7c67d
+    Reviewed-on: https://code.wireshark.org/review/6908
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 9681bdd
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 5 19:41:12 2014 -0500
+commit 73579dd
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Mon Jan 5 13:36:45 2015 +0100
 
-    Eliminate proto_tree_add_text from packet-ppp.c.
+    Bluetooth: ATT: Dissection stage 3: Assign UUID to Handle
     
-    Some of the conversions to proto_tree_add_xxx calls involved using explicit sizes instead of the "option length", so there is skipping of the "byte highlighting" of the type + length bytes.
+    Add possibility to dissect attributes by UUID assigned to handle.
     
-    Change-Id: Ibfe09a089fb33ba43121de079aca81742d48db4c
-    Reviewed-on: https://code.wireshark.org/review/5636
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I0e510bf902492f87e0eaee339d82609c37e12741
+    Reviewed-on: https://code.wireshark.org/review/6905
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit 8ba3d6f
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Dec 31 10:52:28 2014 +0100
+
+    Bluetooth: ATT: Dissect GATT level
+    
+    ATT dissector is now able to decode GATT level fields.
+    This is results of added request-response tracking/share information.
+    
+    Change-Id: I41ac622a38916a7a20f625fa30ac72d7812446c6
+    Reviewed-on: https://code.wireshark.org/review/6904
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit 33f1256
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Feb 2 21:28:01 2015 -0500
+
+    Fix nameless application in NokiaSolutionsAndNetworks.xml (from
+    I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35).
+    
+    (The nameless application was causing known applications to be reported as
+    unknown.)
+    
+    Add code to the Diameter dissector to report such problems at startup (similar
+    code exists for other entities).
+    
+    Tweak the parser debug slightly.
+    
+    Change-Id: I6b28cda8660e6eb96648c7b3697d7fd85151ac96
+    Reviewed-on: https://code.wireshark.org/review/6927
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 74172ae
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Dec 7 20:54:05 2014 +0100
+commit 00f7bc4
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Feb 2 16:22:31 2015 -0800
 
-    LTE: Update MAC and RLC dissectors to Release 12
+    Qt: Fix IO Graph capture file closing.
     
-    Change-Id: I036a0d1180b6481e8cc27210ed44eda4ba078a27
-    Reviewed-on: https://code.wireshark.org/review/5659
-    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Make sure our IOGraphs remove their respective tap listeners before the
+    capture file closes, otherwise the graph data ends up getting cleared
+    via reset_tap_listeners.
+    
+    Bug: 10871
+    Change-Id: I0ef2af2dc84be1921a930df8bb68f63626aa874a
+    Reviewed-on: https://code.wireshark.org/review/6925
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 58fc89a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 9 00:54:34 2014 -0800
+commit 9d7f5c7
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Feb 2 22:28:59 2015 +0100
 
-    Fix copy-and-pasteo.
+    ISIS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
     
-    Change-Id: I181129595c7259f5c0af5308f0ca0190dce67eb7
-    Reviewed-on: https://code.wireshark.org/review/5687
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I58debb32cc7a4aa476961eda342f1cd90884c800
+    Reviewed-on: https://code.wireshark.org/review/6921
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e5757d1
-Author: Irene Ruengeler <ruengeler@wireshark.org>
-Date:   Fri Dec 5 10:04:29 2014 +0100
+commit 383caa7
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Feb 2 22:28:25 2015 +0100
 
-    Fix GTK warning in EXTCAP parts
+    AMQP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
     
-    Change-Id: I3a4d9baf3592db1394d1177a19014cbef9140759
-    Reviewed-on: https://code.wireshark.org/review/5628
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Irene Ruengeler <iruengeler@googlemail.com>
+    Change-Id: Ie55dd06b6c4d6f77012e8e13079279ded2997907
+    Reviewed-on: https://code.wireshark.org/review/6920
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 301a5b7c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Nov 27 23:18:32 2014 -0500
+commit ec618b5
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Feb 1 20:13:13 2015 +0100
 
-    Eliminate proto_tree_add_text from some dissectors.
+    HTTP2: Fix offset for heuristic
     
-    Change-Id: I44cc6b70ec4dfc565934da499f46fca60a4ded93
-    Reviewed-on: https://code.wireshark.org/review/5524
+    With >= draft-14, length is encoded in 3 octets (2 octets before)
+    
+    Bug: 10908
+    Change-Id: I061570186206548fafcc39a8df0ba6bafe8576a0
+    Reviewed-on: https://code.wireshark.org/review/6883
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1952fef
+commit 71fd34d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Feb 2 14:32:28 2015 -0800
+
+    WSUG: Chocolatey updates.
+    
+    Move PowerShell and Chocolatey to the top of the quick setup since most
+    of the instructions now have a "Chocolatey" example.
+    
+    Use "choco install" instead of "cinst" to match the pages at
+    chocolatey.org/packages.
+    
+    Show how to install Cygwin and Python using Chocolatey.
+    
+    MAC = Media Access Control (among other things). Mac = Macintosh.
+    
+    Change-Id: Ic6aabacdd3a86b4e8ca556cc6f3daa62c3e5986b
+    Reviewed-on: https://code.wireshark.org/review/6924
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 37a2cd0
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 5 07:42:34 2014 +0100
+Date:   Mon Feb 2 22:58:41 2015 +0100
 
-    SCTP: Missing break in switch (CID 1135556)
+    AMQP: fix declaration of 'index' shadows a global declaration
     
-    Change-Id: I00939bb9699493fe7af21497d9e9c013cc3d2e62
-    Reviewed-on: https://code.wireshark.org/review/5650
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    St*** Mac OS X buildbot...
+    
+    Part 2 (Oups...)
+    
+    Change-Id: I082d73d4581365d7152aca764e4dfe599ce12c64
+    Reviewed-on: https://code.wireshark.org/review/6923
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 283e5c1
+commit 0b2c8b0
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 3 16:46:46 2014 +0100
+Date:   Mon Feb 2 22:46:08 2015 +0100
 
-    GVSP: Missing break in switch (CID 1247683 & 1247684)
+    AMQP: fix declaration of 'index' shadows a global declaration
     
-    Change-Id: Ibd3aef4101126f02453bab10cd5ca31e716334de
-    Reviewed-on: https://code.wireshark.org/review/5617
-    Reviewed-by: W Moxam <warrenm@ptgrey.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    St*** Mac OS X buildbot...
+    
+    Change-Id: I5efff34ce818f52fb6414191c58b5cabb388ba26
+    Reviewed-on: https://code.wireshark.org/review/6922
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit fbf08cf
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 20:04:23 2014 -0800
+commit c96b3ac
+Author: Petr Gotthard <petr.gotthard@centrum.cz>
+Date:   Sat Jan 31 16:52:51 2015 +0100
 
-    Nothing to free there.
+    AMQP 0-9-1: Fix dissection of field types.
     
-    pcapng_read_block() never sets *err_info if it returns
-    PCAPNG_BLOCK_NOT_SHB - that happens on an EOF, a short read, or on a
-    successful read of something that doesn't look like an SHB.
+    This patch resolves review comments I received from the AMQP 0-9-1 community.
+    Some field types were not implemented, other field types (introduced by my
+    earlier patch) were incorrectly parsed.
+    https://groups.google.com/forum/#!topic/rabbitmq-users/PR7P1bgonwo
     
-    Change-Id: I23ad6aa1c95d800b068a798a4aad1d70d07ac281
-    Reviewed-on: https://code.wireshark.org/review/5686
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    I had to split the dissect_amqp_0_9_field_table() function into two parts
+    and put the field value dissectors in a separate function:
+    dissect_amqp_0_9_field_value().
+    
+    Change-Id: I9aa7d73e426a790830ad260ca6892a7650791e6c
+    Reviewed-on: https://code.wireshark.org/review/6882
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 9f4bf6a
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Feb 2 16:02:59 2015 +0100
+
+    LTE RRC: only display band mapping for the initial supportedBandListEUTRA IE
+    
+    Handling bands > 64 would require to store the mapping in file scope and current code is broken for the Carrier Aggregation band combination list
+    
+    Change-Id: I9f10022a50520ca9bc16a33f2c16361729f1b01b
+    Reviewed-on: https://code.wireshark.org/review/6917
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit e102c34
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Mon Feb 2 16:11:40 2015 +0000
+
+    Minor doc changes for Windows build
+    
+    Further removal of older style build environment.
+    
+    Change-Id: I499ba50f55620ad627de3dc4316051985d00a7f5
+    Reviewed-on: https://code.wireshark.org/review/6918
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+
+commit 6db0a35
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jan 31 08:06:05 2015 -0500
+
+    Create wmem versions of val_to_str and val_to_str_ext
+    
+    These will be used to replace cases where packet-scope isn't valid for val_to_str/val_to_str_ext calls
+    
+    Change-Id: Ie8a4c423a8608548c837c1ae7edde52c4d728340
+    Reviewed-on: https://code.wireshark.org/review/6880
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit bdaef53
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Mon Feb 2 13:37:50 2015 +0100
+
+    Try to fix builbot OSX 10.5 buildbot false-positive
+    
+    Change-Id: If62eba937326ac5119bde97d9a827e165825b377
+    Reviewed-on: https://code.wireshark.org/review/6914
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit 003e337
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Feb 2 09:57:23 2015 +0100
+
+    Fix some indent typo (after g2bf7878e)
+    
+    Change-Id: I44769f127f32ffd8a97b1579f371501f4aa9832a
+    Reviewed-on: https://code.wireshark.org/review/6913
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 6521771
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sun Jan 18 10:44:04 2015 +0100
+
+    Bluetooth: Simplify to "UnknownDirection" in Info column when direction is unknown
+    
+    Change-Id: Ibad679c0b6c95d65389ce087f65b8f31cf3acd68
+    Reviewed-on: https://code.wireshark.org/review/6903
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit 1786cfe
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Mon Jan 19 14:27:29 2015 +0100
+
+    Bluetooth: Advertising Data: Fix Service Data entry
+    
+    Service Data entry is defined as UUID (16, 32 or 128) and
+    rest of payload is specific service data.
+    
+    Bug: 10859
+    Change-Id: Ibaee075a66a144dfc52ed70614677c73a88d6a2c
+    Reviewed-on: https://code.wireshark.org/review/6902
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit 578c2be
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sun Jan 11 11:34:17 2015 +0100
+
+    Bluetooth: btle_rf: Use proto_tree_add_bitmask
+    
+    Change-Id: I79143cb788a13bd67ce2bd515b2b90d427dbcfcb
+    Reviewed-on: https://code.wireshark.org/review/6901
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit ef6f6f0
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Thu Jan 22 09:54:30 2015 +0100
+
+    Bluetooth: AVCTP: Improve IPID handling
+    
+    If profile is invalid (IPID=1) then add expert info.
+    
+    Change-Id: Id102e51eefe7e5e6314c3677468cb66573e5a893
+    Reviewed-on: https://code.wireshark.org/review/6900
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit c4f08ec
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Sat Jan 17 15:07:47 2015 +0100
+
+    Bluetooth: HCI Vendor: Fix for "Enable WBS" command
+    
+    Codec value for mSBC is 0x02 (not 0x01), also "Codec" field
+    does not appear when Codec state in Disable.
+    
+    Change-Id: I4f0b27d0dc8659fdc054eaf18b54a42aad60275b
+    Reviewed-on: https://code.wireshark.org/review/6899
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit 359ff31
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Mon Dec 29 11:07:22 2014 +0100
+
+    Bluetooth: HCI: Improve detecting of undecoded and unknown commands
+    
+    Undecoded command - command does exist in specification,
+                        but not fully implemented in Wireshark yet
+    Unknown command - command does not exist in specification or
+                      it is quite new and opcode number is not added yet
+    Unexpected parameter - is now working correctly that means if
+                           there is known command but too many parameters
+                           so user should know about this issue
+    
+    Change-Id: If3ee24f617f7e6683049558f7a6d68e346e7c92f
+    Reviewed-on: https://code.wireshark.org/review/6898
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+
+commit 2cae320
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sun Feb 1 13:56:39 2015 -0800
+
+    CMake: Build a complete application bundle on OS X.
+    
+    Run osx-app.sh by default on OS X. Aside from giving us a fully portable
+    application bundle after building this should let us clear our library
+    path at startup should the need arise. Change the name of the osx-app
+    target to app_bundle.
+    
+    Search ../Frameworks before ../lib. Create PkgInfo at configure time
+    instead of compile time. Build our program list as we go.
+    
+    Change-Id: If5511ee921108b1c079cef67026eac9e47211be1
+    Reviewed-on: https://code.wireshark.org/review/6896
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 3947091
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Feb 1 12:57:30 2015 -0800
+
+    Fix a typo.
+    
+    Change-Id: I2724340e41572fdaa56ebf75478297090563c522
+    Reviewed-on: https://code.wireshark.org/review/6895
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 17b228b
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Feb 1 12:47:13 2015 -0500
+
+    dlm3: col_...() shouldn't be called under 'if (tree)'
+    
+    Change-Id: I577dbfacf13854c74a430d7abec20faca3f0985b
+    Reviewed-on: https://code.wireshark.org/review/6891
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit 50e8415
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Feb 1 12:32:08 2015 -0500
+
+    rip: Fix "Dissector Bug": register 5 missing hfi_... fields
+    
+    [ Bug Introduced in gf8e24c9 ]
+    
+    Change-Id: I99207334e33b30bf622bbed366c2222113108230
+    Reviewed-on: https://code.wireshark.org/review/6890
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit 351e7d5
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Feb 1 08:06:45 2015 -0800
+
+    [Automatic manuf, services and enterprise-numbers update for 2015-02-01]
+    
+    Change-Id: Iead3755cfba6c39c5da6398e356515337f2ecdd4
+    Reviewed-on: https://code.wireshark.org/review/6887
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 70912c8
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Sun Feb 1 11:07:57 2015 +0000
+
+    Minor doc update for Wwindows build
+    
+    Added comment about VS2013 being the preferred option.
+    Added instructions for Win32.Mak.
+    
+    Change-Id: Ic2cca5123c471d9a806d0f4a387f82ad30ace9f6
+    Reviewed-on: https://code.wireshark.org/review/6886
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+
+commit ff16cfe
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Sun Feb 1 10:52:22 2015 +0000
+
+    Added nsis generated files to .gitignore
+    
+    Change-Id: Id2f1ff7ca5094a785274c41eca0c1f878a427f90
+    Reviewed-on: https://code.wireshark.org/review/6885
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+
+commit a300227
+Author: Petr Gotthard <petr.gotthard@centrum.cz>
+Date:   Fri Jan 30 16:18:48 2015 +0100
+
+    AMQP 0-9-1: Add missing methods connection.block and connection.unblock.
+    
+    Change-Id: I11b32b876ec0f43b1faa2ab40ab66e7f18d981c2
+    Reviewed-on: https://code.wireshark.org/review/6857
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit df468f5
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Jan 31 17:02:30 2015 +0100
+
+    jsmn: check superior token node value before using it
+    
+    Other uses are already checked but it looks like those ones were missing
+    
+    Bug: 10907
+    Change-Id: I35c160657faba4371fedb96ab822bcd4fffa7dd8
+    Reviewed-on: https://code.wireshark.org/review/6881
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+
+commit dc6482b
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jan 31 07:55:10 2015 -0500
+
+    Convert the value string APIs that only currently have packet-scope use to wmem.
+    
+    Change-Id: I36942493ce73b49e7257edea967eddf22f21f58e
+    Reviewed-on: https://code.wireshark.org/review/6879
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 6284040
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Sat Jan 31 02:26:57 2015 +0100
+
+    README.dissector: fixed p_add_proto_data params
+    
+    frame_data has long been gone. struct _packet_info is the same as
+    packet_info, just use that for brevity.
+    
+    Change-Id: Ieb02bf6b642d728a7f80087f5cd750b9691e34e9
+    Reviewed-on: https://code.wireshark.org/review/6865
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit c7717ae
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jan 30 20:13:31 2015 -0800
+
+    Get rid of a trailing blank.
+    
+    Change-Id: I27e3ba1be4a9ee23d619d751ae1abdef963b7597
+    Reviewed-on: https://code.wireshark.org/review/6871
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 4424d6a
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jan 30 20:12:10 2015 -0800
+
+    Fix a comment to reflect reality.
+    
+    Change-Id: I90fce5376ca17648840c473afac7f9e962c14667
+    Reviewed-on: https://code.wireshark.org/review/6870
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 90233ff
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jan 30 20:06:49 2015 -0800
+
+    We need to get the pathname of the executable *before* running dumpcap.
+    
+    In order to find dumpcap, we need to get the pathname of the executable
+    image, and we support -D in the first argument parsing loop, and that
+    runs dumpcap to get the interface list, so we need to get the pathname
+    of the executable image before that.
+    
+    Change-Id: If789cf1ff4f5cf5d5c3b171a3d4eb90a6e2faf1d
+    Reviewed-on: https://code.wireshark.org/review/6869
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit cca2cde
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jan 30 20:03:01 2015 -0800
+
+    No main window *to* update in the early argument list parsing.
+    
+    We haven't yet popped the main window up, so, when we call
+    capture_interface_list(), we shouldn't pass a pointer to the "update the
+    main window" routine.
+    
+    Change-Id: Id3e02199479e66bb9e9aff99b435bd03af45a1af
+    Reviewed-on: https://code.wireshark.org/review/6868
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit ee9d0f9
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jan 30 18:12:51 2015 -0800
+
+    This being C++, maybe we don't have to initialize ws_app until later.
+    
+    Try going back to haveing ws_app be an automatic variable, but don't
+    declare it until after we've done the first-pass argument parsing.
+    
+    Change-Id: Ia1f2a4819570bfadcba75d498e01dbe64991843c
+    Reviewed-on: https://code.wireshark.org/review/6867
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit a984dbf
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jan 30 18:04:26 2015 -0800
+
+    Do the first-pass argument parsing before creating the WiresharkApplication.
+    
+    That way, *all* the don't-need-a-GUI options can be processed without
+    trying to pop up a GUI, just as is the case with the GTK+ version.
+    
+    Change-Id: Icbe47642eec45e887087f46c366322b8f23206cc
+    Reviewed-on: https://code.wireshark.org/review/6866
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit e76e140
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jan 30 23:34:18 2015 +0000
+
+    Qt: Fix library path reset.
+    
+    g9a3676a reset the Qt library path *after* wsApp was instantiated, which
+    is too late. Do so before QCoreApplication has a chance to do anything
+    we might regret.
+    
+    Change-Id: Ibbdb69d1b7c0ea4bf1042e98a5bb5deba13e954e
+    Reviewed-on: https://code.wireshark.org/review/6864
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 9a3676a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jan 30 11:36:10 2015 -0800
+
+    Qt: Clear our library path at startup on Windows.
+    
+    I recently rebuilt my Windows development VM and discovered that I could
+    no longer run Wireshark executables from wireshark.org. Trying to do so
+    failed with the following error:
+    
+    ----
+    This application failed to start because it could not find or load the
+    Qt platform plugin "windows".
+    
+    Available platform plugins are: minimal, offscreen, windows, windows.
+    
+    Reinstalling the application may fix this problem.
+    ----
+    
+    As it turns out there are two issues. According to
+    http://doc.qt.io/qt-5/windows-deployment.html The search path
+    for Qt plugins is hard-coded into the QtCore library. Dependency
+    Walker confirmed this, showing that Qt5Core.dll tried to load
+    C:\Qt\5.3\msvc2013_64_opengl\plugins\platforms\qwindows.dll instead of
+    C:\Program Files\Wireshark\platforms\qwindows.dll.
+    
+    The second issue is that the Qt online installer only uses the major
+    and minor version, e.g. C:\Qt\5.3. This means that you can end up with
+    Qt 5.3.0, .1, .2, or .3 depending on *when* you run the installer.
+    
+    The Windows builders have 5.3.1 installed while my development VM
+    has 5.3.2. Apparently qwindows.dll is not compatible between these two
+    versions, hence the startup error. (...so what happens if you can create
+    a malicious qwindows.dll which *is* compatible on someone's machine?)
+    
+    This change removes any entries from QCoreApplication::libraryPaths that
+    don't match our executable path. This shouldn't be an issue in our case
+    because both the NMake+QMake and CMake environments run windeployqt to
+    copy in any required DLLs.
+    
+    If it *is* an issue or if clearing the library path list causes other
+    problems I can reinstall Qt on the Windows builders into a unique and
+    obvious path, e.g. C:\Qt-check-your-path-before-you-wreck-your-path\5.3
+    
+    Change-Id: I1918bc4e520aba32cfcf9f4ccd37bf9255058cbe
+    Reviewed-on: https://code.wireshark.org/review/6863
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit f61c969
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jan 30 10:54:12 2015 -0800
+
+    NMake: Add Chocolatey paths.
+    
+    Change-Id: I8ea53475a64052e945709a1f5878aa23eee65c74
+    Reviewed-on: https://code.wireshark.org/review/6859
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit eda485e
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Fri Jan 30 13:49:59 2015 -0500
+
+    Cleanup:
+    
+    Including:
+      tvb_length...() ==> tvb_reported_length...()
+      Remove some dead initializers;
+      Localize some variables;
+      Whitespace.
+    
+    Change-Id: Ide9490f248d558bb7e3af96a1fc17d8f911de4ef
+    Reviewed-on: https://code.wireshark.org/review/6862
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit 7b929e2
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Fri Jan 30 13:48:32 2015 -0500
+
+    rtp: cleanup
+    
+    - Remove dead initializers;
+    - Localize some vars;
+    - Whitespace
+    
+    Change-Id: Ie98667de736f2928ce1a2e4986917e4b0457866f
+    Reviewed-on: https://code.wireshark.org/review/6861
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit 1ec66f0
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Fri Jan 30 13:14:36 2015 -0500
+
+    rtps: Cleanup
+    
+    - Remove dead initializers;
+    - Localize some variables;
+    - Whitespace.
+    
+    Change-Id: I876dfd88b2c3fe6a8056090f508c868f4a3cf653
+    Reviewed-on: https://code.wireshark.org/review/6860
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit cc66f68
+Author: Evan Huus <eapache@gmail.com>
+Date:   Fri Jan 30 12:02:47 2015 -0500
+
+    kafka: fill in some expert info
+    
+    Change-Id: I94e655fc56fd1534d57f6917d9e5f4189e08838a
+    Reviewed-on: https://code.wireshark.org/review/6858
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+
+commit 5e3936e
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jan 29 21:20:48 2015 +0100
+
+    BSSGP: ensure that all Optional / Conditional Information Elements are treated as such
+    
+    Bug: 10903
+    Change-Id: I8f6b970a6988fd4e700203304586c8e53dd5696b
+    Reviewed-on: https://code.wireshark.org/review/6845
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit 14a869c
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jan 30 00:02:20 2015 +0100
+
+    GSM MAP: display TBCD digits, USSD string and Location Number digits in a subtree
+    
+    Bug: 10900
+    Change-Id: I01277633a1314e68363ef433f3b99b4138657330
+    Reviewed-on: https://code.wireshark.org/review/6850
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit a614212
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jan 29 23:06:37 2015 +0100
+
+    SDP: add ability to display port as a string
+    
+    Bug: 10898
+    Change-Id: Ib1b5698c85cd568b8874b44690cafe391eea28f3
+    Reviewed-on: https://code.wireshark.org/review/6849
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 78755c7
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Thu Jan 29 18:55:15 2015 -0500
+
+    Disable SSE4.2 _ws_mempbrk_sse42 only for older Apple compilers
+    
+    This is a longer term fix to disable _ws_mempbrk_sse42 in older
+    Apple compilers, which the buildbots currently use. This fix
+    is the longer-term fix for the temprorary one introduced in
+    g9a366b04/I2e438ff29.
+    
+    Bug: 10798
+    Change-Id: I051ca003610c07f7d75cc19b20ff823fe4c1ce05
+    Reviewed-on: https://code.wireshark.org/review/6851
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 2bf7878
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jan 14 17:25:56 2015 -0800
+
+    Qt: Add the RTP Streams dialog.
+    
+    Add keyboard shortcuts. Note that not all of the buttons made it from
+    GTK+.  Add a "Go to setup frame" option.
+    
+    Move rtp_streams.c from ui/gtk to ui.
+    
+    Add a help URL for RTP analysis (which needs to be split into streams +
+    analysis).
+    
+    Fix RTP stream packet marking.
+    
+    Change-Id: Ifb8192ff701a933422509233d76461a46e459f4f
+    Reviewed-on: https://code.wireshark.org/review/6852
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 6824cee
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jan 29 12:09:34 2015 +0100
+
+     CAPWAP: Add support of Cisco Vendor Specific Element
+    
+    Change-Id: I62886bda3220d9aa3a5b3aee8b40063a8bb7745d
+    Reviewed-on: https://code.wireshark.org/review/6843
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit fd1bc6d
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jan 29 10:22:17 2015 +0100
+
+    HCRT: udp port preference changed into range.
+    
+    Change-Id: I6201bec1c3226181d2e5df8f3bf47471136b0ef5
+    Reviewed-on: https://code.wireshark.org/review/6839
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit aaa3d23
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Thu Jan 29 13:24:54 2015 +0100
+
+    When issued with -v wireshark-qt prints version and exits.
+    
+    Change-Id: I3993c502156d534f17baa409729e2dc763910ac8
+    Bug: 10789
+    Reviewed-on: https://code.wireshark.org/review/6840
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 67b069e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jan 29 13:55:18 2015 -0800
+
+    Qt: Add address conversion convenience routines
+    
+    Add address_to_qstring and address_to_display_qstring, which wrap
+    address_to_string and address_to_display respectively and return
+    QStrings. Convert most of the instances in ui/qt to the new routines.
+    
+    Fix a some memory leaks in the process.
+    
+    Change-Id: Icda80bbfe0b2df723d54c8da84355255f819af89
+    Reviewed-on: https://code.wireshark.org/review/6848
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit 2edf8bb
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jan 29 13:55:00 2015 +0100
+
+    SDP: check that media format starts with a digit before trying to identify media type
+    
+    Bug: 10899
+    Change-Id: I92319a668ae795247d4021f32d629f5000ceb395
+    Reviewed-on: https://code.wireshark.org/review/6841
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit 0ba51cc
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Jan 17 16:11:06 2015 +0100
+
+    IS-IS: Add subTLV Bandwidth Constraints (22) used by IS Reachability
+    
+    Change-Id: I7e1d29270aede25268bb75a2b5fc9448dbc1cc9b
+    Reviewed-on: https://code.wireshark.org/review/6585
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 9a366b0
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Thu Jan 29 13:06:03 2015 -0500
+
+    Disable SSE4.2 _ws_mempbrk_sse42 due to bug 10798
+    
+    This is a (possibly) temporary change to master to
+    disable _ws_mempbrk_sse42 to see if that fixes bug
+    10798.
+    
+    Ping-Bug: 10798
+    Change-Id: I2e438ff299f55709c66a37634d2a7e799c513ac9
+    Reviewed-on: https://code.wireshark.org/review/6844
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
+
+commit 0137f92
+Author: Evan Huus <eapache@gmail.com>
+Date:   Thu Jan 29 10:01:38 2015 -0500
+
+    addr_resolv: correctly scope returned memory
+    
+    *_port_to_display functions take an allocator scope, so the memory they return
+    must be allocated from that scope, which means we must strdup the result of
+    serv_name_lookup.
+    
+    Bug: 10901
+    Change-Id: I337c8b6f9dfece966964c09023679b3e24648e48
+    Reviewed-on: https://code.wireshark.org/review/6842
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+
+commit 25f1df4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jan 28 13:04:14 2015 -0800
+
+    "%l[doux]" doesn't mean "64-bit integer".
+    
+    Use G_GINT64_MODIFIER as the format modifier to indicate that the value
+    being printed is 64-bit; there is no guarantee that long is 64-bit (it's
+    not 64-bit on ILP32 platforms such as 32-bit Windows and 32-bit UN*X, or
+    even on LLP64 platforms such as 64-bit Windows).
+    
+    Change-Id: I0444f7f396969824f1040c06a67753718c32881b
+    Reviewed-on: https://code.wireshark.org/review/6838
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 49a7e97
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jan 28 12:56:19 2015 -0800
+
+    Try dissecting some stuff even if we don't have conversation information.
+    
+    Fill in a local transaction information structure, so we can pass data
+    from the packet down.  Skip stuff that depends on conversation
+    information if we don't have any.
+    
+    Change-Id: I5a8bd21bdf632ada9013e616c5fc4e8bd14c9698
+    Reviewed-on: https://code.wireshark.org/review/6837
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 9e647a9
+Author: Petr Gotthard <petr.gotthard@centrum.cz>
+Date:   Mon Jan 26 10:40:01 2015 +0100
+
+    Extended AMQP 0-9 dissector to support AMQP 0-9-1 methods and datatypes. Backward compatibility to AMQP 0-9 is maintained.
+    
+    Change-Id: Ie39cb40dca3d9f778ef2c04cbef24c968a91ec6c
+    Reviewed-on: https://code.wireshark.org/review/6791
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit 6940a97
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jan 28 11:39:04 2015 -0800
+
+    Go back to installing 5.2.3 for now.
+    
+    Change-Id: I1c798cd1a74aee559225fea1e4bc3694466de861
+    Reviewed-on: https://code.wireshark.org/review/6836
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 83678a0
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jan 28 10:58:32 2015 +0100
+
+    Proto dialog (GTK) : fix indent (use 2 spaces) and add modelines
+    
+    Change-Id: I36945843b8d544188a3ffe89f397e669f3944593
+    Reviewed-on: https://code.wireshark.org/review/6831
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit f011af2
+Author: Anders <anders.broman@ericsson.com>
+Date:   Wed Jan 28 13:41:00 2015 +0100
+
+    Add files missing from the tarball.
+    
+    Change-Id: I126f40ac122a7b9236e8718a89d35ad12fc89c04
+    Reviewed-on: https://code.wireshark.org/review/6834
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit d7538cb
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jan 27 18:51:05 2015 +0100
+
+    ANSI IS-637-A: prevent an out of bounds access
+    
+    Bug: 10897
+    Change-Id: I8316ba40ec00b612e4edd490e3cd36e7277912a9
+    Reviewed-on: https://code.wireshark.org/review/6824
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 7b1c3ab
+commit 15c895d
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 19:57:21 2014 -0800
+Date:   Wed Jan 28 01:47:31 2015 -0800
 
-    Manually fix a pidl bug - that field should be an FT_STRING.
+    Make the USB header information an enumerated type.
     
-    No, I don't know why it's making it FT_NONE; it's a bit of a weird data
-    type, with a string inside a structure.
+    It's not really a bitset, it's a choice of one of four types of USB
+    pseudo-header.  Make it an enum.
     
-    Change-Id: I27a6d7577ef4a9f4da8ddad2cad97ad097135e90
-    Reviewed-on: https://code.wireshark.org/review/5685
+    Change-Id: I4ea994e1606c23e0a0f08b1b61357eea40a2535e
+    Reviewed-on: https://code.wireshark.org/review/6830
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 5c29704
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 19:24:33 2014 -0800
+commit 53a5e4f
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jan 27 16:59:30 2015 +0100
 
-    LDAP's DirSyncFlags are a bitfield, so show it as an unsigned integer in hex.
+    win32: fix detection of Windows 10 Technical Preview
     
-    Change-Id: I2a06b13528ad7dfc587bfb9c1333d4f7a497614e
-    Reviewed-on: https://code.wireshark.org/review/5684
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    The version number changed from 6.4 to 10.0
+    
+    Change-Id: Ie749c97e8335f77d414d80edbd69373bd9a1cdad
+    Reviewed-on: https://code.wireshark.org/review/6820
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 3d95c62
+commit 946856a
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 17:30:04 2014 -0800
+Date:   Wed Jan 28 01:17:04 2015 -0800
 
-    Don't try to look in a non-existent hash table.
+    Move tests out of try_dissect_linux_usb_pseudo_header_ext().
     
-    We only create hash tables if somebody puts a handler in one, so we need
-    to check whether the hash table exists first, to avoid run-time warnings.
+    Do the tests in its callers; rename it to just
+    dissect_linux_usb_pseudo_header_ext() and don't bother passing it the
+    header_info flag.
     
-    Change-Id: I739d2d808935e651b11bd44b258f168a42ca4b7c
-    Reviewed-on: https://code.wireshark.org/review/5683
+    We can remove some of those tests as they're already done in the caller.
+    
+    Change-Id: I7c3cfefba833a84c834462307088f5c31612128e
+    Reviewed-on: https://code.wireshark.org/review/6829
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit f34bcb7
+commit f090ebb
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 16:13:39 2014 -0800
+Date:   Tue Jan 27 21:23:55 2015 -0800
 
-    Don't put bitmasks under an FT_NONE.
+    Add documentation URLs for the Linux USB and USBPCAP pseudo-headers.
     
-    Change-Id: I172c68d233e3887a94c0835234613dfd483ee5af
-    Reviewed-on: https://code.wireshark.org/review/5682
+    Change-Id: If5cecfeb66b3caca6478206f2fcb2f617ef02b46
+    Reviewed-on: https://code.wireshark.org/review/6828
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 260af59
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 16:06:11 2014 -0800
+commit 3aab6fc
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jan 27 09:25:29 2015 -0800
 
-    Values in a value_string_ext *must* be sorted.
+    Qt: Update packet list freeze/thaw behavior.
     
-    Change-Id: I0c2bcd81955375abf3af24e42c70bea0bb960083
-    Reviewed-on: https://code.wireshark.org/review/5681
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Move the clear() calls in gee320ef a bit earlier in the code to
+    PacketList::freeze. No model means no packets.
+    
+    Bug: 10896
+    Change-Id: Ie440e3da4c5fb601048f4e94c8712ecf2d864d4f
+    Reviewed-on: https://code.wireshark.org/review/6823
+    Reviewed-by: Sean Stalley <seanstalley@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 32e1ff9
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 15:36:26 2014 -0800
+commit 9976422
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jan 27 14:34:35 2015 +0100
 
-    Don't put bitmasks under an FT_NONE.
-    
-    proto_tree_add_bitmask() requires that the field under which it's
-    putting the bitmasks be an FT_INTn or FT_UINTn, so that it can determine
-    the length of the field.
+    Added json heuristic to Dropbox LAN sync Discovery Protocol.
     
-    Arguably, proto_tree_add_bitmask() should, instead, take a length
-    argument, just as other proto_tree_add_ routines do, and, arguably, we
-    should perhaps not even have FT_UINTn and FT_INTn, just FT_UINT and
-    FT_INT, with the display width for hex and octal (leading zeroes)
-    determined by the actual length of the field or something such as that,
-    or as part of the field that also contains the base.
+    Change-Id: I0d649ddc0f1539616eca0322ba54a7735338c738
+    Reviewed-on: https://code.wireshark.org/review/6817
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit d3261b2
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Tue Jan 27 12:55:05 2015 -0500
+
+    Comment out various 'if(tree)'
     
-    But, even with that, we might want to require an FT_UINTn or FT_INTn
-    anyway, at least in cases where the value of the field as a whole is
-    interesting.
+    col..._() and/or expert...() should not be called under 'if(tree)'
     
-    Change-Id: I4dff8fb1686a30b7d145c089dd1be7f96ecf23e0
-    Reviewed-on: https://code.wireshark.org/review/5680
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I57efe44794977d3f93e4764642b091044a125c0c
+    Reviewed-on: https://code.wireshark.org/review/6826
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit ffcacae
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 15:25:50 2014 -0800
+commit 75858d7
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Tue Jan 27 12:01:43 2015 -0500
 
-    Have different MTP2 dissectors for different metadata and CRC.
+    rtps: Remove various 'if(tree)'
     
-    Have separate MTP2 dissectors for:
+    col_...() and expert_...() should not be called under 'if(tree)'
     
-       MTP2 frames with no pseudo-header and no CRC;
+    Change-Id: I2f1a8345ff18c0174bcd81b37179aa2d5ee74aca
+    Reviewed-on: https://code.wireshark.org/review/6825
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit 678cf27
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Jan 27 15:14:47 2015 +0100
+
+    NETROM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
     
-       MTP2 frames with a pseudo-header and no CRC;
+    Change-Id: Ie534cbd4fb592d18f27039c654ba08e1beb7edff
+    Reviewed-on: https://code.wireshark.org/review/6819
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 2e10308
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Jan 27 15:13:46 2015 +0100
+
+    HCrt: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
     
-       MTP2 frames with no pseudo-header and a CRC;
+    Change-Id: I453c9b068a53292ab63cd3416569eea7d66361ba
+    Reviewed-on: https://code.wireshark.org/review/6818
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 7dfda88
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 26 19:53:49 2015 +0100
+
+    WIMAX: fix no previous prototype for ... [-Wmissing-prototypes]
     
-    and call the appropriate dissector in the appropriate places.
+    Also comment the unused function wimax_decode_sub_dl_ul_map
     
-    While we're at it, get rid of a global variable - pass the "use extended
-    sequence numbers" flag down through the dissection code path, rather
-    than having it as a global.
+    Part 2...
     
-    Change-Id: Id8da1fbe3529e3ffadd5c30646cbc922f506a01f
-    Reviewed-on: https://code.wireshark.org/review/5679
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I1836aa2851156e4f756c5697f86a142625d697c9
+    Reviewed-on: https://code.wireshark.org/review/6810
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 8a446e9
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Sat Nov 15 09:44:22 2014 +0100
+commit ceb8d95
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sun Jan 25 14:30:13 2015 -0500
 
-    Add missing build-dependencies for the Debian package
+    Lua: Expose tcp_dissect_pdus() to Lua
     
-    They are libparse-yapp-perl and libsbc-dev.
+    Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus()
+    to make TCP-based dissection easier.
     
-    Change-Id: I474179bb805acb87f8bf316730d63eb294e10a69
-    Reviewed-on: https://code.wireshark.org/review/5322
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Bug: 9851
+    Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3
+    Reviewed-on: https://code.wireshark.org/review/6778
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit d87a952
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 8 14:09:33 2014 -0800
+commit 9bbc337
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Tue Jan 13 15:13:27 2015 +0100
 
-    It's a reasonable expectation that we will have C++ style comments in
-    ui/qt.
+    Added HPFEEDS stats_tree.
     
-    Change-Id: Iedbf2a2d3cbfee00912e6e883928836932dea566
-    Reviewed-on: https://code.wireshark.org/review/5678
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I256fd5395b062fa954ebd60598721323ea1d7ff1
+    Bug: 10875
+    Reviewed-on: https://code.wireshark.org/review/6713
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 08e624f
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Dec 8 13:41:02 2014 -0800
+commit c80aa10
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Tue Jan 27 11:53:05 2015 +0100
 
-    Remove an unnecessary include.
+    HCrt fix no previous prototype for 'proto_register_hcrt' [-Wmissing-prototypes]
     
-    Change-Id: I55332c21ea66ee7d564c2b338cba524ea774b19c
-    Reviewed-on: https://code.wireshark.org/review/5677
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Idca780885263c068ba31bbccb6009e75221b3adf
+    Reviewed-on: https://code.wireshark.org/review/6816
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit d5f771c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Dec 8 11:40:35 2014 -0800
+commit 32cbf79
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 26 08:15:35 2015 +0100
 
-    Use correct expression in a "length too short" message.
+    Qt: Add checkable for Find Packet icon
     
-    Doesn't change the behavior of the code, but makes it more consistent.
-    
-    Change-Id: I6f07fbbb4c7d14d8a46ecfd1c419d951c356fd77
-    Reviewed-on: https://code.wireshark.org/review/5672
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Idd3c0b1893a9e0f8bc329e9157baaccd10de7378
+    Reviewed-on: https://code.wireshark.org/review/6814
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0bd79c5
-Author: Hannes Mezger <hannes.mezger@ascolab.com>
-Date:   Mon Dec 8 11:20:16 2014 +0100
+commit b5a3907
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 26 08:46:34 2015 +0100
 
-    Fix full name of NodeId namespace index field, was a copy&pase error
+    Packet List (Qt): fix extra ‘;’ [-Wpedantic]
     
-    Change-Id: I7b1eea9965880e35c65f04406ff756d245b568d4
-    Reviewed-on: https://code.wireshark.org/review/5668
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I3ac80a13da91452de4c857abfd6f2661b00e2f5d
+    Reviewed-on: https://code.wireshark.org/review/6815
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 52df6ef
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Dec 3 12:36:18 2014 +0100
+commit 77227d4
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 26 08:00:43 2015 +0100
 
-    Try to improve reassembly when SIP PDU starts in the middle of a segment
-    and continues trough the next segment(s).
+    GTK: Fix multispace on main title bar
     
-    Change-Id: I8efe69361fda0c60ec6544cc6bbe28c91f07207c
-    Reviewed-on: https://code.wireshark.org/review/5583
+    Change-Id: I275a586c16621fdfabede23f6a1d03c8d8556b3f
+    Reviewed-on: https://code.wireshark.org/review/6813
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f16376e
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Thu Nov 27 15:09:52 2014 +0100
+commit 5e309d6
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 26 07:48:55 2015 +0100
 
-    Fix showing error dialog when calling vsimple_error_message_box()
+    CAPWAP: fix double space on AC Software version
     
-    SimpleDialog requires a parent, when none is provided (as there is no parent available during startup), the error message is queued and displayed after MainWindow is available.
-    Calling SimpleDialog::exec() directly returns if no parent is set (hence the dialog is not shown)
+    Change-Id: Ibe9715a1c2bf31e31ddda5ad2ad62fc0eda8164c
+    Reviewed-on: https://code.wireshark.org/review/6812
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit ec7ff4e
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 26 08:48:57 2015 +0100
+
+    GTK: fix no previous prototype for ... [-Wmissing-prototypes]
     
-    This resulted in silently ignoring error messages that were shown using vsimple_error_message_box(), as this function did not provide a parent (and the queue messages were not dequeued anymore as the MainWindow was already available)
+    Add by commit g43f09e67b (Remove unneeded includes from ui folder)
     
-    Change-Id: I2f4c1b4926c196ab40b035161cec530105396537
-    Reviewed-on: https://code.wireshark.org/review/5519
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I66eb113430bde97e18bb3d2b00f6bac46a01797e
+    Reviewed-on: https://code.wireshark.org/review/6809
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e172ebb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 29 15:58:56 2014 -0500
+commit a9aba94
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 26 08:45:36 2015 +0100
 
-    Add proto_tree_add_bitmask_with_flags.
+    GTK: fix no previous prototype for ... [-Wmissing-prototypes]
     
-    It's proto_tree_add_bitmask with the ability to control the data appended to header.
+    Add by commit g43f09e67b (Remove unneeded includes from ui folder)
     
-    Change-Id: Icce97437ba7cfc9158ec204a837da8db8138424a
-    Reviewed-on: https://code.wireshark.org/review/5533
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I7c9d9e2bbd76d062f96422c74ee8eb8c6ecd328b
+    Reviewed-on: https://code.wireshark.org/review/6808
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 75cdf92
+commit 11d25fa
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 5 09:02:37 2014 +0100
+Date:   Mon Jan 26 08:17:06 2015 +0100
 
-    802.11: fix indent (use 2 spaces) and modelines for 802.11 h file
+    CATTP: fix no previous prototype for 'proto_register_cattp' [-Wmissing-prototypes]
     
-    Change-Id: If886809d9eeb900bb94c045413ff1295519b8311
-    Reviewed-on: https://code.wireshark.org/review/5641
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ifedb45d95d622c6df29f6917918015676f506831
+    Reviewed-on: https://code.wireshark.org/review/6807
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f47bc26
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 25 12:23:52 2014 +0100
+commit c0c2b45
+Author: Roland Knall <roland.knall@br-automation.com>
+Date:   Mon Jan 26 15:08:18 2015 +0100
 
-    CAPWAP: Add some IEE802.11 Message Element Type (RFC5416)
+    epl: Add Manufacturer subdissector
     
-    * IEEE 802.11 Antenna (1025)
-    * IEEE 802.11 Direct Sequence Control (1028)
-    * IEEE 802.11 MAC Operation (1030)
-    * IEEE 802.11 MIC Countermeasures (1031)
-    * IEEE 802.11 Multi-Domain Capability (1032)
-    * IEEE 802.11 Station (1036)
-    * IEEE 802.11 Supported Rates (1040)
-    * IEEE 802.11 Tx Power (1041)
-    * IEEE 802.11 Tx Power Level (1042)
-    * IEEE 802.11 WTP Radio Configuration (1046)
+     Allow manufacturer specific plugins, which will only
+     be called for certain service IDs which are manufacturer
+     specific as defined by the POWERLINK specification.
     
-    Enhance 802.11 Rate Set (1034)
+     As with e.g. udp.port, a plugin or subdissector may
+     register with epl.asnd and a given service ID to implement
+     a plugin for specific ASND Service IDs, which are part
+     of the manufacturer specific object range (0xA0-0xFE).
     
-    Change-Id: Ib37bc4081e75af051d80d023ddba689ecd9bf9ff
-    Reviewed-on: https://code.wireshark.org/review/5481
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+     Also, all values for the ID fields have been changed to
+     range_string
+    
+    Change-Id: Ibfb9c035c16bce5322b13c42f30daf14e096712a
+    Reviewed-on: https://code.wireshark.org/review/6793
+    Reviewed-by: Roland Knall <rknall@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 58b7277
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 5 09:00:13 2014 +0100
+commit 4fb2ec0
+Author: Joe Fowler <fowlerja@us.ibm.com>
+Date:   Fri Jan 23 22:17:50 2015 -0500
 
-    802.11: Add ieee80211_supported_rates_vals_ext to be exported
+    SMC-R: fix incorrect dissection of non-SMCR packet. Failover
+    Validation bit definition is missing
     
-    It will be reused by CAPWAP dissector (* Rates Message Element)
+    dissect_smcr_tcp_heur() passes incorrect length to tvb_memeql(),
+    resulting in incorrectly identifying a packet as SMC-R.
     
-    Change-Id: I60ce12f382a35cdc2747baf23e2e3c30a305a8bd
-    Reviewed-on: https://code.wireshark.org/review/5640
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Added Failover Validation bit.
+    
+    Bug: 10887
+    Change-Id: I9f33389bd974b4c410a6b077d0d133221c77ee0d
+    Reviewed-on: https://code.wireshark.org/review/6765
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 212ba58
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Dec 7 12:17:48 2014 -0800
+commit ee320ef
+Author: Evan Huus <eapache@gmail.com>
+Date:   Mon Jan 26 22:35:12 2015 -0500
 
-    Add checks for non-null-terminated strings.
+    qt: clear tree and bytes when no packet selected
     
-    Change-Id: Iaad2d2f76e5d554800ba2c79d5c01f4b9da6fa0b
-    Reviewed-on: https://code.wireshark.org/review/5660
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Otherwise trying to interact with them will cause all sorts of funny crashes.
+    
+    There's probably a better way to trigger these (having the widgets register for
+    a signal, and sending that signal, or something something something) but this
+    works and I don't feel like reading 20 pages of Qt documentation right this
+    instant.
+    
+    Change-Id: Ic52806ae5ba8d7776f835695590559b8c705d083
+    Ping-Bug: 10896
+    Reviewed-on: https://code.wireshark.org/review/6803
+    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit 5f79940
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Dec 5 07:56:36 2014 +0100
+commit a835c85
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jan 26 11:38:33 2015 -0800
 
-    Endpoint: wrong filter when select a SCTP endpoint (INVALID == a.x.y.z ...)
+    Pcapng: Don't fetch past the end of a GArray.
     
-    Change-Id: I396e9af7971ee8be6fc9548162ff37fe704f0289
-    Reviewed-on: https://code.wireshark.org/review/5651
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Due to an off-by-one error an invalid ISB interface ID could make us
+    fetch past the end of a GArray. Found using American Fuzzy Lop.
+    
+    Bug: 10895
+    Change-Id: I7d4049ad7a386ae7e8013b8e741d54a31f353f1f
+    Reviewed-on: https://code.wireshark.org/review/6798
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 42cdc2b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 7 19:51:16 2014 +0100
+commit 5845f29
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Mon Jan 26 13:58:01 2015 -0500
 
-    dcerpc: Missing break in switch (CID 280449 & 280450 & 284051)
+    rtp: Don't call col_...() under 'if (tree)'
     
-    Change-Id: I68fa9650c234c0f1fb8464b464a781b54f2c728c
-    Reviewed-on: https://code.wireshark.org/review/5657
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I7d75e8d02aeaa67155ec52dd0167d1692286b951
+    Reviewed-on: https://code.wireshark.org/review/6800
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 9d8cb74
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 7 19:48:17 2014 +0100
+commit 717b5a2
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Mon Jan 26 13:31:15 2015 -0500
 
-    iec104: Missing break in switch (CID 280459)
+    rtmpt: Remove 'if (tree)'
     
-    Change-Id: I6abc157368a78e1abfde672728b88a36ba6e76cc
-    Reviewed-on: https://code.wireshark.org/review/5656
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Setting a var under 'if (tree)' and then using it later (not under 'if (tree)') to affect col_...()/expert_...() is not OK.
+    
+    Change-Id: I144b5fa50b4550cd14c604970f5d84dbf13f3e90
+    Reviewed-on: https://code.wireshark.org/review/6799
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit fd087fb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Dec 7 19:46:53 2014 +0100
+commit c9579d0
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Jan 26 16:20:16 2015 +0100
 
-    AFS: Missing break in switch (CID 280434 & 280435)
+    3GPP: upgrade 2G/3G NAS dissector to v12.8.0 and NAS EPS dissector to v12.7.0
     
-    Change-Id: Ia0a39f7e4670d74325ddc40b34cd56ca018c0bde
-    Reviewed-on: https://code.wireshark.org/review/5655
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I770506762074b50d40b4f4742d8316368f14b4de
+    Reviewed-on: https://code.wireshark.org/review/6794
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit a68a3da
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Dec 7 19:36:32 2014 +0100
+commit d5f0f25
+Author: Anders <anders.broman@ericsson.com>
+Date:   Mon Jan 26 16:50:06 2015 +0100
 
-    make our counting a bit clearer
+    Add Cmakefiles missing from the distribution.
     
-    Change-Id: Ie64573f5a0b6e921a5011e487eea8e55f72b9a0b
-    Reviewed-on: https://code.wireshark.org/review/5653
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: I77333bb1ca4b0fdfa2db095aab2e4e663c029dd3
+    Reviewed-on: https://code.wireshark.org/review/6797
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e456dec
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Dec 7 19:27:57 2014 +0100
+commit d50b27f
+Author: Evan Huus <eapache@gmail.com>
+Date:   Sun Jan 25 09:18:00 2015 -0500
 
-    don't initialize variables if the first thing we do is assign a
-    different value to them
+    gsm-rlcmac: use wmem_new0 for a struct
     
-    Change-Id: I719db9180b2ba5f21653086f2697ca9bac68d6b1
-    Reviewed-on: https://code.wireshark.org/review/5652
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Fixes "Conditional jump or move depends on uninitialised value" from Valgrind.
+    
+    I couldn't really figure out how this code was supposed to function, it seems to
+    initialize one member of the union and then expect *all* the others to just
+    magically work (which they apparently do in most cases, oddly). The real bug
+    could be in csnStreamDissector or who knows, but this at least turns "garbage
+    data" into "zeros" which makes valgrind happy and turns a potential vuln into
+    at worst a bad decoding.
+    
+    Bug: 10891
+    Change-Id: Ia29dd625b46b3b76ff521b4203148fe8b0c59ec3
+    Reviewed-on: https://code.wireshark.org/review/6769
+    Petri-Dish: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit ade2bef
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Dec 6 18:28:37 2014 +0100
+commit abf5703
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jan 24 18:34:53 2015 -0500
 
-    make sure that we don't read past the end of the compressed buffer
+    Register EtherNet/IP dissector for "external" use (like SSL)
     
-    Bug: 10757
-    Change-Id: I30054c4a75ec86ea603cf78b702be5255c35f549
-    Reviewed-on: https://code.wireshark.org/review/5642
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Ic918c27f36569572523a17abb172b94cc32f2e3b
+    Reviewed-on: https://code.wireshark.org/review/6786
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 1bc8791
+commit d465682
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Dec 5 19:42:47 2014 -0500
+Date:   Sun Jan 25 17:32:40 2015 -0500
 
-    Eliminate proto_tree_add_text from packet-telnet.c
+    Roll functionality of h225-persistentdata module into packet-h225.c
     
-    Change-Id: I0e8610f381e650f2c5b3f78ea927b727ec9ac62a
-    Reviewed-on: https://code.wireshark.org/review/5637
+    Change-Id: I19b2a1b19e1e77a6456e2310daf64ddff572b0d2
+    Reviewed-on: https://code.wireshark.org/review/6788
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit afa5558
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Dec 7 08:05:11 2014 -0800
+commit 155fc8f
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jan 24 18:55:55 2015 -0500
 
-    [Automatic manuf, services and enterprise-numbers update for 2014-12-07]
+    Move #defines of epan/greproto.h to packet-gre.h
     
-    Change-Id: Ice8195b09120fb21144e504289a64fd5af84775b
-    Reviewed-on: https://code.wireshark.org/review/5647
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I5de4c34e2acafbe47a8ca3f07040a774e72d0d3e
+    Reviewed-on: https://code.wireshark.org/review/6787
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit de61f06
+commit d015eff
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Dec 6 15:59:07 2014 -0800
+Date:   Sun Jan 25 14:37:44 2015 -0800
 
-    The packet encapsulation is in pkt_encap, not rec_type.
+    Update another comment to reflect reality.
     
-    rec_type is the type of record (which isn't necessarily a packet; future
-    work on libwiretap will let it return non-packet data); if it's a packet
-    (REC_TYPE_PACKET), then pkt_encap contains the "link-layer"
-    encapsulation for the packet (in quotes because it may contain metadata
-    not transmitted over the network).
-    
-    Change-Id: I6f32b02f4466df6d7b07dbdc9d77e881830ac749
-    Reviewed-on: https://code.wireshark.org/review/5645
+    Change-Id: I9747b746ed7c38ed3aa78f19ae20b61e142b94cc
+    Reviewed-on: https://code.wireshark.org/review/6785
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 22da8a3
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Dec 6 16:21:07 2014 -0500
+commit fcac03d
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 25 14:34:07 2015 -0800
 
-    Remove annex_a_used from packet_info structure.
+    Update a comment to reflect reality.
     
-    Change-Id: I660caa8283aecff5060c6ed476f316bc5793373e
-    Reviewed-on: https://code.wireshark.org/review/5643
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
+    Change-Id: I6376ce5eab43443314e73116161a24111f8c46d7
+    Reviewed-on: https://code.wireshark.org/review/6784
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 6d4c0ed
+commit 88e22bde
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 5 20:53:39 2014 -0800
+Date:   Sun Jan 25 14:31:39 2015 -0800
 
-    Don't go past the end of the "extra data".
-    
-    The "extra data", according to the RF5 API manual I have, is "hardware
-    parameters", so change some names.
-    
-    Report an error if the variable parts of the configuration event record
-    run past the record length.
-    
-    Report an error if the hardware parameters are too short.
+    Remove some references to SVN.
     
-    For the purportedly DS0 hardware parameters, don't assume they'll be
-    long enough for the mask; they might not be.
+    Rename the --get-svn and --set-svn options to --get-vcs and --set-vcs;
+    continue to support --get-svn and --set-svn as aliases, for backwards
+    compatibility.  Change variable names as well.
     
-    Change-Id: Ib63d042e4ede32216fb474c4ecdba84db1387abc
-    Reviewed-on: https://code.wireshark.org/review/5638
+    Change-Id: If25d81dae747f9825f7e3e5e937749f078f63d27
+    Reviewed-on: https://code.wireshark.org/review/6783
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 8c190d6
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 3 16:39:58 2014 +0100
+commit be798e1
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Jan 25 15:51:01 2015 -0500
 
-    RPKI-RTR: Missing break in switch (CID 1233099)
+    pana, gsm_abis_oml, rsl, netrom: Remove 'if (tree)'
     
-    Change-Id: I01f01ce51fb1c9deb857ef01696b406b97dca3a9
-    Reviewed-on: https://code.wireshark.org/review/5616
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Thou shalt call col_...() and/or a dissector under 'if(tree)'
+    
+    Change-Id: Ibe62bc8229cb759d5f8b092aa7143d8e2f799037
+    Reviewed-on: https://code.wireshark.org/review/6781
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 646d52e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Dec 3 16:48:48 2014 +0100
+commit 065304c
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Jan 25 12:04:14 2015 -0500
 
-    PCEP: Missing break in switch (CID 1247685)
+    applemidi: col_...() shouldn't be called under 'if(tree)'
     
-    Change-Id: Id001a6c1e116fdabfd51c354832ca68f50e65e7d
-    Reviewed-on: https://code.wireshark.org/review/5618
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I6ae8e122f1d1e7200255b51d2017b4375045c797
+    Reviewed-on: https://code.wireshark.org/review/6780
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit a5fe0d4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Dec 4 10:57:16 2014 +0100
+commit c107896
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 25 13:50:37 2015 -0800
 
-    BT obex: Missing break in switch (CID 1132031)
+    Replace "GIT" with "VCS" in make-version.pl and files it manipulates.
     
-    Change-Id: I6b8fc8db006bc3b8f8f4bac019cb7e240931d3b5
-    Reviewed-on: https://code.wireshark.org/review/5619
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    That makes it more VCS-neutral - apparently some people maintain private
+    versions under VCSes other than Git, and make-version.pl still handles
+    those VCSes.
+    
+    Change-Id: Ie4914b16fea8ce800582729260c5e9b9cf1111f4
+    Reviewed-on: https://code.wireshark.org/review/6779
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit bb00570
+commit a3f3d0b
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 5 15:46:58 2014 -0800
+Date:   Sun Jan 25 12:50:05 2015 -0800
 
-    Fix some copy-and-pasteos in error messages.
+    Don't say "Git Rev" if the VCS being used isn't Git.
     
-    Change-Id: I1fe3434e69a08aae3d7413067275b3d7ee1552f5
-    Reviewed-on: https://code.wireshark.org/review/5634
+    Change-Id: Ibd298b9665214e8af137a05ffb0c0aee67af91bf
+    Reviewed-on: https://code.wireshark.org/review/6777
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 4510306
+commit bba51b6
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 5 13:14:31 2014 -0800
+Date:   Sun Jan 25 12:14:58 2015 -0800
 
-    Get rid of a trailing blank.
+    Get rid of unused is_release preference.
     
-    Change-Id: I0cf6d04f5075ba1f064c40f4b39b32b6976b54c7
-    Reviewed-on: https://code.wireshark.org/review/5633
+    Change-Id: I458f1d398b4eb566dd73e879ea3236a4de67da63
+    Reviewed-on: https://code.wireshark.org/review/6776
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b98c570
+commit 2f713a6
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Dec 5 13:04:59 2014 -0800
+Date:   Sun Jan 25 12:01:54 2015 -0800
 
-    Fix varargs handling in col_{add,append}_lstr().
+    Update some comments to reflect reality.
     
-    We do multiple va_start() calls using the first string in the list of
-    strings; do *not* use the first-string argument to iterate over all the
-    argument strings, as that means that only the first va_start() call will
-    do the right thing, use a separate variable.
-    
-    Bug: 10755
-    Change-Id: Ic4a6c24f911e335d147883a25d30289628836875
-    Reviewed-on: https://code.wireshark.org/review/5630
+    Change-Id: I230e3914bcd902dd481b59637f5ea21afc496978
+    Reviewed-on: https://code.wireshark.org/review/6775
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 18fabb4
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Dec 2 09:40:46 2014 -0500
+commit aec1bcf
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Sat Jan 24 15:58:30 2015 -0500
 
-    Strengthen association matching when we haven't seen the INIT/INIT-ACK.
+    Lua can free tvbuffs too early
     
-    The fact that the vtag matches the initiate tag doesn't mean much if both are 0
-    (uninitialized).
+    Lua-created tvbuffs should be kept around for the duration of pinfo's
+    lifetime, instead of only for the duration of frame dissection. So
+    instead of using the frame dissector's frame_end_routine, we'll register
+    a callback to wmem for pinfo pool's allocator.
     
-    Also leave in some (commented-out) debug to make debugging this stuff easier
-    in the future.
-    
-    Change-Id: Id007de8bf9d2d4e0bb18309ed3e2572fedda45f1
-    Reviewed-on: https://code.wireshark.org/review/5571
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Bug: 10888
+    Change-Id: I3e9db671c3f2a7cab9e258aca17f3be8acaf2417
+    Reviewed-on: https://code.wireshark.org/review/6768
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 0867344
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Thu Dec 4 16:59:43 2014 -0700
+commit 716f9a3
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jan 25 08:06:13 2015 -0800
 
-    Look for python3 in addition to python in configure script.
+    [Automatic manuf, services and enterprise-numbers update for 2015-01-25]
     
-    Change-Id: I77ff22aabdbbbf7376483b53d8795e7fbf0c0433
-    Reviewed-on: https://code.wireshark.org/review/5627
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: Ic9c4903a49473c40f66dcf650f59d6a498bb9c05
+    Reviewed-on: https://code.wireshark.org/review/6772
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit d5a4cc3
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Thu Dec 4 13:15:41 2014 -0700
+commit 5003654
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Jan 25 09:53:25 2015 -0500
 
-    Make autogen.sh look for "python3" if "python" isn't found before
-    giving up.
+    Cleanup:
     
-    Change-Id: Id109c78f90da71c54c7b4fd6df20cc153248f46f
-    Reviewed-on: https://code.wireshark.org/review/5623
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Including:
+      Remove dead initializers;
+      Remove boilerplate comments;
+      Localize some variables;
+      tvb_length...() ==> tvb_reported_length...();
+      Use TRUE/FALSE when assigning a value to a gboolean;
+      whitespace/indentaion.
+    
+    Change-Id: I09e1f15611011bbe393d23e1cb54568ddd3cebc6
+    Reviewed-on: https://code.wireshark.org/review/6771
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 3b7c165
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Dec 4 22:49:42 2014 +0100
+commit b91df34
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sat Jan 24 17:09:36 2015 -0500
 
-    use the same data types as in i2c_phdr
+    v52: Fix a minor bug introduced in  gc71e88e; plus ...
     
-    Change-Id: Ic0abcf8173a690a1dc0cd250f5e8770eb92a5aa9
-    Reviewed-on: https://code.wireshark.org/review/5626
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Create/use extended value strings
+    tvb_length...() --> tvb_reported_length...()
+    
+    Cleanup:
+     Remove some dead initializers;
+     Declare some vars as 'const' (initialized value is never changed);
+     localize some vars;
+     whitespace;
+    
+    Change-Id: Iee21bb67fb42b1160b8ba2b7c2b89b410cc22225
+    Reviewed-on: https://code.wireshark.org/review/6770
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 5d95067
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Dec 4 22:38:16 2014 +0100
+commit 5280188
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jan 12 14:31:16 2015 +0100
 
-    simplify dissect_i2c()
+    Added HCrt (Hotline Command-Response Transaction) Dissector.
     
-    Change-Id: I67dd6ae5dc48b297e5c04aba2fe53e3e159d2611
-    Reviewed-on: https://code.wireshark.org/review/5625
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Bug: 10853
+    Change-Id: Ieddb98b16e47906ba187cf03669b02a3ad397d60
+    Reviewed-on: https://code.wireshark.org/review/6533
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 73f48a0
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Thu Dec 4 22:25:39 2014 +0100
+commit b2a5f15
+Author: Evan Huus <eapache@gmail.com>
+Date:   Sat Jan 24 13:01:30 2015 -0500
 
-    dont't manually throw a ReportedBoundsError if the packet is empty
-    use tvb_captured_length() instead of tvb_length()
+    RTPS: Memset entire buffer
     
-    Change-Id: I7e7efd69515fc3e30c986ac5d9a56b4db1931c10
-    Reviewed-on: https://code.wireshark.org/review/5624
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Apparently some compilers do sufficient inlining optimization to notice that
+    there's at least one caller of rtps_util_add_typecode which passes an
+    indent_level of 0. Such compilers are *also* picky enough to complain about
+    memset being called with a length of 0, leading to a warning which we turn into
+    a compile error.
+    
+    I thought about putting in an "if indent_level > 0" but I figure memsetting the
+    entire buffer (length >= 1) is simpler and more efficient in the common case.
+    
+    Change-Id: Ica21ba988eb0c1251e7b4ef2e110336d5ee32837
+    Reviewed-on: https://code.wireshark.org/review/6766
+    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit 70ca52c
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Thu Dec 4 14:38:35 2014 +0100
+commit cf142c6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sat Jan 24 10:28:56 2015 -0800
 
-    3GPP: upgrade 2G/3G NAS dissector to v12.7.0 and NAS EPS dissector to v12.6.0
+    Get Wireshark to compile with afl-gcc.
     
-    Change-Id: I1e5bc5d28cb956b333c302b1cb18335b59d096a8
-    Reviewed-on: https://code.wireshark.org/review/5621
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Fix errors found by American Fuzzy Lop's afl-gcc
+    (http://lcamtuf.coredump.cx/afl/):
+    
+    peektagged.c:
+    error: 'fileVersion' may be used uninitialized in this function
+    
+    packet-h223.c:
+    error: variable 'circuit_id' might be clobbered by 'longjmp' or 'vfork'
+    
+    wslua_proto.c:
+    error: variable 'd' might be clobbered by 'longjmp' or 'vfork'
+    
+    wslua_proto.c:
+    error: variable 'dt' might be clobbered by 'longjmp' or 'vfork'
+    
+    Change-Id: Idd74a3ad7b236d3a8756c1e7e917b1c74143f381
+    Reviewed-on: https://code.wireshark.org/review/6767
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit ab3c182
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Dec 4 09:54:08 2014 -0500
+commit 7ed097c
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jan 23 13:29:52 2015 -0800
 
-    There's no need to talk about update-alternatives here.
+    Fix an uninitialized variable warning.
     
-    Our "make install" process does nothing with 'alternatives'.  Our RPMs do use
-    alternatives but they do the necessary update-alternatives stuff already.
+    Change-Id: I3a5c211db767e1980a8c1f2fd706139c0bf6f943
+    Reviewed-on: https://code.wireshark.org/review/6764
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit b714da2
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jan 23 12:09:51 2015 -0800
+
+    CMake: Make sure DATAFILE_DIR exists.
     
-    (If someone wants to set up Linux "make install"s to use alternatives it would
-    make sense to put these notes to the user back in.)
+    Create DATAFILE_DIR when we're building an application bundle. Hopefully
+    this will fix the build error on the OS X x86 builder.
     
-    Change-Id: Ib7f4655a222ccaee83830a97b213656856cee73e
-    Reviewed-on: https://code.wireshark.org/review/5622
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I57414bcd87ab21958ae8131a8cd77951b29e02f7
+    Reviewed-on: https://code.wireshark.org/review/6763
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit b2fcbb2
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Dec 3 22:12:52 2014 -0500
+commit 21dfda6
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jan 23 09:18:29 2015 -0800
 
-    Add a MIME type for Tektronix rf5 files and register Wireshark for that type of
-    file.
+    Qt: Remove windowIcon property from our .ui files.
     
-    The magic matching comes from wiretap/k12.c.
+    Setting the windowIcon property in foo.ui means we end up with a
+    setWindowIcon call in ui_foo.h. Along with setting the window title
+    bar icon, it also sets the taskbar icon on Windows. A 16x16 PNG gives
+    us a jaggy taskbar icon. (Windows ICO format is supported via a plugin
+    which might not be available everywhere, otherwise we could try using
+    a .ico resource.)
     
-    (Yes, I just made the application/x-tektronix-rf5 MIME type up.)
+    Move the setWindowIcon call from ge990d1b to the top of the MainWindow
+    constructor and enable it everywhere.
     
-    Change-Id: Iafd7300aa7f2664bb06e1330caede10785c21d68
-    Reviewed-on: https://code.wireshark.org/review/5607
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I4e9765200bb3676c4faa8e0ab1505ce02fb64870
+    Reviewed-on: https://code.wireshark.org/review/6762
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit a919566
-Author: Steve Karg <skarg@users.sourceforge.net>
-Date:   Wed Dec 3 13:30:42 2014 -0600
+commit d8d2d8e
+Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
+Date:   Fri Jan 23 15:09:50 2015 +0000
 
-    BACnet: fix dissection of exception-schedule property.
+    jpeg: Add handling for comment marker
     
-    The exception schedule special-event disection already used matched
-    open-close tags and only needed to check for an unmatched close tag
-    to exit when used with ReadPropertyMultiple service.
+    Change-Id: I10ad7021f6535d65d88faf734fb5800e4415a811
+    Reviewed-on: https://code.wireshark.org/review/6759
+    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+
+commit cce3ad2
+Author: Petr Gotthard <petr.gotthard@honeywell.com>
+Date:   Tue Jan 20 19:04:05 2015 +0100
+
+    Correctly dissect the AMQP 0-9 heartbeat frames. The heartbeat frames were
+    incorrectly highlighted as erroneous.
     
-    Bug: 10691
-    Change-Id: I54f2f6f3f470138a6a88f84c62fd15b07ea74c37
-    Reviewed-on: https://code.wireshark.org/review/5593
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I94f8ef73e2432543ae3965da3789f27e872951ea
+    Reviewed-on: https://code.wireshark.org/review/6685
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit b32e39e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jan 20 12:26:14 2015 -0800
 
-commit f27c345
-Author: Michele Baldessari <michele@acksyn.org>
-Date:   Wed Dec 3 20:14:33 2014 +0100
+    Test suite: Add verbosity to the HTTP2 test.
+    
+    We should probably do the same for the other decryption tests but we're
+    having issues with HTTP2 right now.
+    
+    Change-Id: I8e8f5da200a29a5ca1cddb39c082bb7ee12d1eaf
+    Reviewed-on: https://code.wireshark.org/review/6686
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit f5c0bd2
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jan 23 09:56:28 2015 +0100
+
+    802.11: Fix encoding for VHT NDP STA Info
+    
+    Using little endian for encoding
+    
+    Ping-Bug: 10786
+    Change-Id: Ic2a7f52ccbba32a801c102df4e5aa0a792654602
+    Reviewed-on: https://code.wireshark.org/review/6755
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit bab7447
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Dec 7 14:30:50 2014 +0100
 
-    Add resource-id parsing to the X11 errors that return it
+    CAPWAP: Add support of Fortinet Vendor Specific Element
     
-    - Rename BadColor to BadColormap as the former does not exist in the X11
-      specs
-    - Parse the bad resource id field in case of the following errors:
-      BadColormap, BadWindow, BadPixmap, BadCursor, BadFont, BadDrawable,
-      BadGC and BadIDChoice
+    Based from FortiAP/WiFi 5.2.x
     
-    Change-Id: I5b23d32189e1a8bb291c656cf6383a85b3e89642
-    Reviewed-on: https://code.wireshark.org/review/5592
+    Change-Id: Ia78d15d54db01939a3d91947db39e35b3abc2519
+    Reviewed-on: https://code.wireshark.org/review/5646
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b8a2364
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Dec 4 00:03:03 2014 -0800
+commit e990d1b
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jan 22 16:48:17 2015 -0800
 
-    Don't do the desktop integration stuff if we're not building Wireshark.
+    Try to fix the jaggy taskbar icon.
     
-    Wireshark is the desktop app; if we're not building it (i.e., we're only
-    building the command-line TShark), we don't need any desktop files.
+    Possibly related to https://bugreports.qt.io/browse/QTBUG-19441.
     
-    Change-Id: Id8244b417fd53c9d55b4d77fe3ad748c98868ad7
-    Reviewed-on: https://code.wireshark.org/review/5615
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Idf7ff8a247f459ce465907760ca0ebeaff2cffa8
+    Reviewed-on: https://code.wireshark.org/review/6746
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c02417f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 23:56:10 2014 -0800
+commit 888229b
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Thu Jan 22 22:40:01 2015 -0500
 
-    Don't do all the fd.o desktop integration stuff on OS X.
+    Make netlink dissector register the attribute length header field info
     
-    It doesn't need it, so don't install those files, or uninstall them, or
-    suggest running various unnecessary commands after the installation
-    finishes.
+    The header field info variable named hfi_netlink_len isn't registered
+    by the netlink dissector, but is added to the tree, resulting in a
+    runtime error. This commit changes the variable name slightly, to
+    be more accurate, and correctly registers it.
     
-    Change-Id: Ieecab22884723670f47f2fc7cc1ac827f48c1967
-    Reviewed-on: https://code.wireshark.org/review/5614
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 10884
+    Change-Id: Iaa4e556d5bbe87b72a0cdca2fbf397fa95e074cc
+    Reviewed-on: https://code.wireshark.org/review/6751
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 6e5d84f
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Dec 3 15:22:39 2014 -0500
+commit 407b703
+Author: Hadriel Kaplan <hadrielk@yahoo.com>
+Date:   Fri Jan 23 00:04:18 2015 -0500
 
-    Rename some filter names to fix cases of duplicate filter names.
+    Fix some WsLua documentation errors
     
-    Note: Use of most of these filter names could have caused a Wireshark crash.
+    The format of the API chapter was a bit screwed up, as was the
+    indentation level of attributes. Also, some functions introduced
+    in 1.11.3 were not documented as being since that version.
     
-    Change-Id: I393402a25dd26d174baff77f4706f6d5f43a94ae
-    Reviewed-on: https://code.wireshark.org/review/5610
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I7912488c6da5b5ae72933e4c5ce49f8fbf0b0e34
+    Reviewed-on: https://code.wireshark.org/review/6753
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f8c0bff
+commit 8d1a984
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Dec 3 15:19:36 2014 -0500
+Date:   Fri Jan 23 00:24:46 2015 -0500
 
-    mac-lte: Rename expert filter name to fix conflict with same name in hf[]
+    Remove incorrect 'if (tree)'
     
-    Change-Id: I906a195b3c6a1e68f273decc9c443a233af4f9be
-    Reviewed-on: https://code.wireshark.org/review/5609
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit d519617
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Dec 3 14:14:53 2014 -0500
-
-    mausb: Rename expert filter names to fix dup filter names.
+    Incorrect because of one or both of the following:
+    - col_...()/expert...() called under 'if (tree)'
+    - vars set under 'if (tree)' used later (not under 'if (tree)'
+       as args to col_...()/expert_...()
     
-    Change-Id: Id650c3aff6d073b05e844574ffbde8fec4368f49
-    Reviewed-on: https://code.wireshark.org/review/5608
+    Change-Id: I89f7d453f2d6eaa40d51cbd794ed2c9be7e549de
+    Reviewed-on: https://code.wireshark.org/review/6754
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 245bdd1
+commit 5a23a02
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 18:37:50 2014 -0800
+Date:   Thu Jan 22 19:33:37 2015 -0800
 
-    Put a bunch of suggestions in post-install/post-uninstall hooks.
-    
-    This covers a bunch of commands that might have to be run after "make
-    install".  ("might" - none are needed on OS X, for example, as it's a
-    different desktop and its dynamic loader doesn't have a cache that you
-    have to manually update whenever you install a new shared library.)
+    Add .dirstamp - it's apparently some autotools thing.
     
-    Change-Id: I21e1728bdde26a7ab1585fdfb54f63fdc1c25dd6
-    Reviewed-on: https://code.wireshark.org/review/5606
+    Change-Id: I3303744858d807b1472c2e53ff6d886270664be2
+    Reviewed-on: https://code.wireshark.org/review/6752
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 1ffe32b
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Dec 3 16:59:08 2014 -0500
+commit 19a8eaf
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jan 22 13:04:15 2015 -0800
 
-    Fix building of RPMs and get RPM builds working with a prefix other than /usr again.
+    Use luaL_{check,opt}integer() rather than luaL_{check,opt}int().
     
-    (Change I567269d8e45e6543d9e39dbedc49830adf7edb9f made the desktop files
-    install outside of /usr/share/ .)
+    Lua prior to 5.3 defined luaL_{check,opt}int() as macros wrapping
+    luaL_{check,opt}integer() with a cast to int; Lua 5.3 doesn't.
     
-    RPMs now build and work regardless of the prefix but the desktop integration stuff
-    only works if the prefix is /usr or (if you're lucky) /usr/local .
+    It sounds as if the Lua developers are deprecating luaL_{check,opt}int():
     
-    Change-Id: If20e0127a044eac1ba099f959a90d068c4bb2ae5
-    Reviewed-on: https://code.wireshark.org/review/5600
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+        http://osdir.com/ml/general/2014-10/msg46568.html
+    
+    Change-Id: I2d0b649dcd57ede124f31d39f7945f342ae9b18f
+    Reviewed-on: https://code.wireshark.org/review/6744
+    Petri-Dish: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
 
-commit 44e2716
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Dec 3 20:02:04 2014 -0500
+commit 2eaa467
+Author: Evan Huus <eapache@gmail.com>
+Date:   Thu Jan 22 20:53:24 2015 -0500
 
-    Tell the loader where to find our libraries if we're being installed
-    someplace other than /usr .
+    oids: fix memory leak
     
-    Change-Id: I42cbe98bcfc0e8ba2aa08f651044db051d31205c
-    (cherry picked from commit 25d9695cb3536b672f4cd8bc280e2a3c816a0d8a)
-    Conflicts:
-       packaging/rpm/SPECS/wireshark.spec.in
-    Reviewed-on: https://code.wireshark.org/review/5605
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    In oid_encoded2subid_sub(), the scope we get may be NULL, in which case if we
+    don't return our allocated buffer, it is our responsibility to free it. Minor
+    regression from ge333e4c90f0aca41b0a56cef22fd80d0b0e73e14.
+    
+    Bug: 10883
+    Change-Id: I324ca770278ab0575511c5e9ab72b70d6ac1a391
+    Reviewed-on: https://code.wireshark.org/review/6748
+    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit f0bd311
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Dec 3 16:05:29 2014 -0800
+commit 612e286
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jan 22 17:51:48 2015 -0800
 
-    CMake: Don't cache LUA_LIBRARIES.
+    Fix test script to test Lua Pinfo, and fix problem it found.
     
-    Don't cache the LUA_LIBRARIES variable. This matches the behavior of the
-    other library modules and fixes a compilation problem on my machine
-    where /usr/local/lib/liblua.dylib wasn't showing up in the various
-    build.make and link.txt files.
+    The test script was running lua/nstime.lua rather than lua/pinfo.lua for
+    the Pinfo test, and the Pinfo test was testing the ipproto property for
+    a Pinfo, but that was removed.
     
-    Change-Id: Ib75ef303f2e67b266a246621718d0ea2ab885dca
-    Reviewed-on: https://code.wireshark.org/review/5603
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Iccdccd265dd550e41640af3acd607362f1f2f02e
+    Reviewed-on: https://code.wireshark.org/review/6747
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 0d20456
+commit 5b55288
 Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Dec 3 17:54:45 2014 -0500
+Date:   Thu Jan 22 14:39:55 2015 -0500
 
-    Make a note that cmake needs to install the freedesktop integration files too.
+    Add a changelog entry for the license tag change (I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e).
     
-    Change-Id: I5eeeb2fa32e8f90bc56f0515e0fc9f6c5f88eb79
-    Reviewed-on: https://code.wireshark.org/review/5602
+    Change-Id: I5e715579be9b415cd0fd957c66c7bd82319c88b3
+    Reviewed-on: https://code.wireshark.org/review/6743
     Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 7ef5abc
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Dec 3 17:05:00 2014 -0500
+commit 96f9746
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Thu Jan 22 12:05:57 2015 -0500
 
-    Don't run gtk-update-icon-cache when uninstalling the Qt package.  But do run
-    it when installing the gnome package.
+    pppoe: col_...()/expert...() shouldn't be under 'if (tree)'
     
-    Change-Id: I0bbd9c0edc3fb6fe0e672aa3dbea5ba23d847d87
-    Reviewed-on: https://code.wireshark.org/review/5598
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: I93726546d86af677153b6b2d46fc072851a33460
+    Reviewed-on: https://code.wireshark.org/review/6741
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit c86d1d2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Dec 3 20:48:08 2014 +0100
+commit f38a63a
+Author: Stefan Metzmacher <metze@samba.org>
+Date:   Tue Sep 23 23:11:25 2014 +0200
 
-    FC: fix dissection when packets are captured with Fibre Channel FC-2 encapsulation type
+    packet-smb2: implement SMB2 NegotiateContexts
     
-    This is broken since ga9dd765
-    
-    Bug: 10751
-    Change-Id: Id4f282d9e0104bfa2314e2348aedf31233a671bd
-    Reviewed-on: https://code.wireshark.org/review/5594
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I0a2c7ffa2490196989dce96b659337b4fee92c7e
+    Signed-off-by: Stefan Metzmacher <metze@samba.org>
+    Reviewed-on: https://code.wireshark.org/review/6711
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 0a30f68
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 29 19:00:58 2014 +0100
+commit 48c90d1
+Author: Stefan Metzmacher <metze@samba.org>
+Date:   Tue Sep 23 23:12:29 2014 +0200
 
-    start dissecting the stsz box
+    packet-smb2: fix getting the dataoffset in dissect_smb2_write_request()
     
-    Change-Id: Ia8fce9307bae33c44d630af403980d162afd88c2
-    Reviewed-on: https://code.wireshark.org/review/5597
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    It's 2 byte only so we need to use tvb_get_letohs().
+    
+    Change-Id: Idbab6428f4242abbbff089d7e1d1bf4cc86930b1
+    Signed-off-by: Stefan Metzmacher <metze@samba.org>
+    Reviewed-on: https://code.wireshark.org/review/6710
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 2f39f2e
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 29 18:50:59 2014 +0100
+commit 97d0f36
+Author: Stefan Metzmacher <metze@samba.org>
+Date:   Wed Jan 21 08:17:19 2015 +0100
 
-    BOX_TYPE_STZ2
+    packet-smb2: correctly dissect dcerpc traffic over different named pipe handles
     
-    Change-Id: I4eadf2b613b7803c81593e517408631f8375ab2c
-    Reviewed-on: https://code.wireshark.org/review/5596
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Id98d1c7e28d88f6cd50f5ef770eec95e57008458
+    Signed-off-by: Stefan Metzmacher <metze@samba.org>
+    Reviewed-on: https://code.wireshark.org/review/6709
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit ee48194
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 29 12:58:20 2014 +0100
+commit 749c68c
+Author: Stefan Metzmacher <metze@samba.org>
+Date:   Wed Jan 21 08:14:23 2015 +0100
 
-    start dissecting the mvhd box
+    packet-dcerpc: change transportsalt to guint64
     
-    Change-Id: I66c1973daa89690f6aaa10891408e93e886875ea
-    Reviewed-on: https://code.wireshark.org/review/5595
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    This will be able to hold also SMB2 file ids and maybe other stuff in future.
+    
+    Change-Id: Ib55895a346b7dc6562291730693453728c99fe91
+    Signed-off-by: Stefan Metzmacher <metze@samba.org>
+    Reviewed-on: https://code.wireshark.org/review/6708
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit b088ca5
+commit 87e691f
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 11:03:23 2014 -0800
+Date:   Thu Jan 22 03:05:34 2015 -0800
 
-    Squelch some "can't happen in reality" warnings.
+    Remove a mysterious comment that no longer applies.
     
-    (I guess newer versions of GCC/Clang know that dissect_eh_frame() is
-    never called with a segment_size of 0, so the loop is traversed at least
-    once.  NOTE: if it ever *is* called with a segment_size of 0, then
-    that's a genuine bug and needs to be fixed.)
+    There's nothing special about LUA_VERSION when it comes to the user
+    overriding it - they'd do that by changing it, the same as with any
+    other _VERSION variable.  Remove the comment about it, which is now out
+    of date in any case.
     
-    Also, segment_size is used; no need to mark it as unused.
-    
-    Change-Id: I63b7a580a853b55f22494de73b4c4e6f9a387647
-    Reviewed-on: https://code.wireshark.org/review/5591
+    Change-Id: I414ddaff43c96304f49b81bdbd135d85536c17dc
+    Reviewed-on: https://code.wireshark.org/review/6739
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit db462ce
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Dec 3 12:57:38 2014 +0100
+commit 39a984e
+Author: Bastien Bailly <babassbailly@free.fr>
+Date:   Thu Jan 22 09:50:37 2015 +0100
 
-    Try to please the buildboots by plasing th '#' at the begining of the
-    line.
+    GTP: Bad bytes read for extended rnc id value
     
-    Change-Id: Ie17e83504e7fbccb71190b3fdbfb6ad3507a806e
-    Reviewed-on: https://code.wireshark.org/review/5584
+    offset+=2; is missing and bytes used for extended rnc id value are the same that for rnc id value.
+    
+    Bug:10877
+    Change-Id: I2830191e434812d42ab625e7a6e0478a191b7d95
+    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-on: https://code.wireshark.org/review/6738
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit c4602e1
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Nov 25 15:16:48 2014 +0100
-
-    elf: fix .eh_frame parsing, add expert info for bad CIE length
-    
-    Fixes, matching LSB 4.1[1] and the AMD64 ABI[2]:
-     - Multiple CIE entries can exist after the first one. Introduce a CFI
-       subtree and add CIE and FDE records below it. Merge comon parsing
-       functionality of CIE/FDE. A CIE terminator is treated specially, and
-       added instead of a CFI subtree.
-     - Validate the header length before using it to avoid a dissector
-       assert. This condition is triggered by a binary produced by a buggy
-       gold linker[3].
-     - Add two expert items: one to detect an invalid CIE length (too small
-       or too large) and one to detect a segment which is larger than the
-       CFI records (to catch the gold linker bug[3] where the segment begins
-       with zeroes).
-     - Do not overload the elf.eh_frame.length field with the value of the
-       Extended Length, instead use elf.eh_frame.extended_length (likewise
-       for FDE).
-     - Stop tracking the subsection size with another variable
-       (remaining_length), just store the end of the entry.
-     - Fix typos in descriptions, improved / shortened field descriptions.
-    
-    Tested with the 'bad' and 'good' binary from bug 10726 as well as the
-    'a' binary from bug 8818 (which introduced this code). Decodes properly.
-    
-     [1]: https://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/ehframechpt.html
-     [2]: http://www.x86-64.org/documentation/abi.pdf
-     [3]: https://sourceware.org/bugzilla/show_bug.cgi?id=17639
-    
-    Bug: 10726
-    Change-Id: I523600b8141bd8953ae468051a57357ab199a258
-    Reviewed-on: https://code.wireshark.org/review/5488
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
+commit f8fa70f
+Author: Marko Hrastovec <marko.hrastovec@gmail.com>
+Date:   Wed Jan 21 15:03:43 2015 +0100
+
+    Decoding of Asterix categories 063 and 065 extended to item decoding.
+    
+    Categories 063 and 065 were decoded only partially. Now the dissector
+    dissects all the items in these two categories.
+    
+    Change-Id: Ib8fd1d18327cbea668600f7376a6b83a270909a2
+    Reviewed-on: https://code.wireshark.org/review/6714
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit c69ccab
+commit dadf2c1
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 01:06:02 2014 -0800
+Date:   Thu Jan 22 00:32:28 2015 -0800
 
-    Install the other desktop files with "make install" as well.
-    
-    (And remove them with "make uninstall".)
+    Lua 5.3.0 is now out; install it.  (It has better 64-bit integer support.)
     
-    Change-Id: I76b554bf1a1272813d61c8d2c96cda0a152eebb5
-    Reviewed-on: https://code.wireshark.org/review/5582
+    Change-Id: I99cad6bd6c5646bfbaddfdde317673cf749766a8
+    Reviewed-on: https://code.wireshark.org/review/6737
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 08c0247
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Fri Nov 28 16:53:04 2014 +0100
+commit 2cd0472
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jan 22 00:30:47 2015 -0800
 
-    Support dissecting REAL (BER) data values
+    Un-install and re-install if the installed and specified versions differ.
     
-    Both exponent and 'integer N' values are limited:
-     * max exponent is 3 octets/24-bits
-     * max integer N is 8 octets/64-bit
+    If, for a package, the version specified by the _VERSION variable
+    doesn't match the version installed (as indicated by a -done file),
+    un-install it, and remove the downloaded version, before doing any
+    installs, so that the specified version replaces the installed version.
     
-    Tested with zero value/length, integers, doubles, positive and negative numbers all using the Basic Encoding Rules (BER)
-    
-    Change-Id: If92e1b3e209c42909b8cb76e6f50b8e6cd1da0da
-    Reviewed-on: https://code.wireshark.org/review/5527
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I32021c7be8cdc277ad51c9f11cfdb57e3bb542c4
+    Reviewed-on: https://code.wireshark.org/review/6736
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e55fe95
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Dec 3 09:55:08 2014 +0100
+commit 5a928c2
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jan 22 00:18:40 2015 -0800
 
-    Make dissect_sip_tcp() a new style dissector.
+    Remove autotools packages if something they depend on changes.
     
-    Change-Id: I773f6738b3ed507e1ce031ee308d16de4bdeb7d4
-    Reviewed-on: https://code.wireshark.org/review/5580
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Uninstall automake if autoconf is going to be changed; remove libtool if
+    autoconf or automake is going to be changed.
+    
+    Change-Id: I4aced967cb7bed197d3f1a4be851a0bc78c8f12d
+    Reviewed-on: https://code.wireshark.org/review/6735
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit fb0999a
+commit 2cc9474
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 00:21:59 2014 -0800
+Date:   Wed Jan 21 20:15:05 2015 -0800
 
-    Use $(srcdir) when installing image/wsicon.svg.
-    
-    We're not necessarily running from the top-level source directory.
+    When uninstalling a library, first uninstall what depends on it.
     
-    Change-Id: I0bb815275f85630e5316bf593f4ac098d9475308
-    Reviewed-on: https://code.wireshark.org/review/5579
+    Change-Id: I80a719acd90e225b28ca16a24ca74030498a5a42
+    Reviewed-on: https://code.wireshark.org/review/6734
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit d6d55b2
+commit 0fbb25f
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Dec 3 00:18:01 2014 -0800
+Date:   Wed Jan 21 20:05:23 2015 -0800
 
-    Uninstall the icons with "make uninstall".
+    Rename install_libpixman to install_pixman, to match uninstall_pixman.
     
-    Just in case not all shells expand {list}, create the apps/icons and
-    apps/mimetypes directories separately; that makes it a bit clearer in
-    any case.
-    
-    Change-Id: I25b3426a17a2ca7e1ce3ce1f7f9e1c650db511a7
-    Reviewed-on: https://code.wireshark.org/review/5578
+    Change-Id: If71895cae49000ff4a4b5bb8211f0b21feed82bc
+    Reviewed-on: https://code.wireshark.org/review/6733
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b5a52ee
+commit b7db12e
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 2 22:21:13 2014 -0800
+Date:   Wed Jan 21 18:40:49 2015 -0800
 
-    Get rid of trailing blank.
+    Do tests in the order the comment before them implies.
     
-    Change-Id: Ia0eecbbe1ff1778d5c34338e042c0518895663b4
-    Reviewed-on: https://code.wireshark.org/review/5577
+    Change-Id: Ie82ce54915866bdf635da832dd2f4c4ae1f2937e
+    Reviewed-on: https://code.wireshark.org/review/6732
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit cff44e5
+commit 64108f4
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Tue Dec 2 22:19:01 2014 -0800
+Date:   Wed Jan 21 18:30:26 2015 -0800
 
-    Always install icons, and install them under $(datadir).
+    Give PortAudio a versioned -done file.
     
-    We always install them because of bug 10737.
+    If there's an unversioned -done file, make it a versioned file under the
+    assumption that the requested version is what's installed.
     
-    We install them under $(datadir) because that's where we should install
-    our data - if your desktop environment can't find the icons there,
-    either it's broken (file a bug) or misconfigured (fix the configuration
-    or, if you didn't configure it, file a bug).
+    Create a versioned file when installing.  Use the installed version when
+    uninstalling, and remove the versioned file.
     
-    Bug: 10737
-    Change-Id: I567269d8e45e6543d9e39dbedc49830adf7edb9f
-    Reviewed-on: https://code.wireshark.org/review/5576
+    Change-Id: Ic21e0f139bb35df8f159a5ba7732706357a099fb
+    Reviewed-on: https://code.wireshark.org/review/6731
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c681091
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Dec 2 17:34:29 2014 -0500
+commit 0426236
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jan 20 20:41:49 2015 -0500
 
-    Fix instances of duplicate display-filter-names with incompatible types.
+    Get us building with the subdir-objects automake option.
     
-    Change-Id: I3b5afb8a59f6443624708b9fecfdcbe93dad59ef
-    Note: Some of the filters, when/if used, could have caused Wireshark crashes.
-    Reviewed-on: https://code.wireshark.org/review/5575
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 43e759e
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Dec 2 22:18:55 2014 +0100
-
-    L2TP: add dissection of H bits
+    subdir-objects will be enabled unconditionally in automake-2.0 and
+    automake-1.14 gives us warnings about the upcoming change.
     
-    As requested in https://ask.wireshark.org/questions/38280/l2tp-dmpt-header-h-bit
+    Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and
+    I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of
+    the source files rather than the full path to each.
     
-    Change-Id: If6cb61c720505e547432e87faf2a36bb4ec6e7c5
-    Reviewed-on: https://code.wireshark.org/review/5574
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-
-commit 5abfc60
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Dec 2 16:09:26 2014 +0100
-
-    Couchbase: fix missing comma...
+    In echld don't use sources in the top-level directory in libechld: it breaks
+    distclean with subdir-objects turned on.
     
-    Change-Id: Ic86e07b434e693d2f0fbd9518a23ed49cf49f24d
-    Reviewed-on: https://code.wireshark.org/review/5572
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 10648
+    Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76
+    Reviewed-on: https://code.wireshark.org/review/6697
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit d5aa8a4
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Dec 2 15:32:34 2014 +0100
+commit d93a90b
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jan 21 18:09:30 2015 -0800
 
-    Couchbase: fix Extended value string 'opcode_vals' forced to fall back to linear search
+    Make the individual install_ and uninstall_ functions idempotent.
     
-    entry 85, value 128 [0x80] < previous entry, value 245 [0xf5]
+    Move the "do I want this and, if so, is it already installed?" checks
+    into the install_ functions.
     
-    Change-Id: I14bbe276eef5fdaa70561764ac4e6f2e174ceabe
-    Reviewed-on: https://code.wireshark.org/review/5570
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f6a4f32
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Dec 1 15:00:13 2014 +0100
-
-    cms: Handle media_type pkcs7-mime and pkcs7-signature
+    Move the "is this already installed?" checks into the uninstall_
+    functions, and have them clear the appropriate installed version
+    variable when finished.
     
-    Change-Id: I7db4e67ffe99a9f3b41d0b507d9837e0237d4547
-    Reviewed-on: https://code.wireshark.org/review/5558
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Also, fetch the installed versions early in the main line.
+    
+    Change-Id: I9e5d8ca48285c6d424a4a2a5f53f4aa449a891d3
+    Reviewed-on: https://code.wireshark.org/review/6730
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 077b45e
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Dec 1 15:13:25 2014 +0100
+commit 33c1858
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jan 21 16:27:09 2015 -0800
 
-    imf: Added base64 content encoding support
+    Pull the installs into a function.
     
-    Change-Id: I668b9c3dfcac83c698e83d4111af8bd19ec8076c
-    Reviewed-on: https://code.wireshark.org/review/5559
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Call it install_all to avoid collision with the OS's install command, if
+    any; rename the uninstall function to uninstall_all to match.
+    
+    Change-Id: I9383424ff3910f04244493569fed3e5bc5d3d99d
+    Reviewed-on: https://code.wireshark.org/review/6729
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 485399a
-Author: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date:   Tue Nov 18 21:11:22 2014 +0300
+commit 16f2147
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jan 21 16:17:07 2015 -0800
 
-    Update Couchbase dissector
+    Pull the install and uninstall sequences into functions.
     
-    * Include DCP port to the list default ports
-    * Parse payloads for DCP commands:
-      * OPEN_CONNECTION
-      * ADD_STREAM
-      * STREAM_REQUEST
-    * Reorganize if conditions to cases
-    * Update list of known commands
+    That lets us put the install and uninstall sequences for a particular
+    tool or library together, and separates them from the overall
+    installation and uninstallation flow.
     
-    Change-Id: Id37b5c61f0d1084628c6286fd6e4ad722e1d6d99
-    Reviewed-on: https://code.wireshark.org/review/5388
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I5e7def9983b587ba7c3276a9d5762db340a04802
+    Reviewed-on: https://code.wireshark.org/review/6728
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 9c05b7f
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Tue Dec 2 12:53:46 2014 +0100
+commit f7d9334
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Jan 21 16:55:47 2015 -0500
 
-    Make it possible to register an OID dissector to dissect
-    ManagementExtension.
+    isakmp: col_...() shouldn't be called under 'if (tree)'
     
-    Change-Id: I52c626b0d7a63214ccecf13d62e0a2850c2dee07
-    Reviewed-on: https://code.wireshark.org/review/5569
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I6fa497ca99e2ad3b675697fd28eeafd61190a17c
+    Reviewed-on: https://code.wireshark.org/review/6726
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 987383d
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Dec 1 17:21:41 2014 +0100
+commit bc5c484
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Jan 21 15:49:12 2015 -0500
 
-    6LoWPAN: use manually managed memory for the stateful address decompression preferences
+    Remove some dead initializers
     
-    Bug: 10747
-    Change-Id: I9d1b7ce2782f7cd133ab3ba02b0dd43afab3e145
-    Reviewed-on: https://code.wireshark.org/review/5560
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I16c88b5e8f6e79a0d9b33b9c3c4d94f77ecfdfa2
+    Reviewed-on: https://code.wireshark.org/review/6723
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit f260f9a
-Author: Matthieu Texier <matthieu@texier.tv>
-Date:   Mon Dec 1 23:48:44 2014 +0100
+commit b0f37ba
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Jan 21 15:33:36 2015 -0500
 
-    BGP: Incorrect decoding AS numbers when mixed AS size
+    vcdu: minor cleanup
     
-    Fix AS Path Heuristic
+    - Remove dead initializers (and localize some vars);
+    - proto_item_set_len() takes a 'proto_item *';
+    - Use gboolean for a TRUE/FALSE var;
+    - Remove a set of unneeded brackets.
     
-    Issue reported by Jon
-    
-    Bug: 10742
-    Change-Id: Ie5e4108bd93464a2d1076dcc4f322171ea8e68cb
-    Reviewed-on: https://code.wireshark.org/review/5564
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ic7b27e2cd321c9d307c01cc4afdb0fc4c6d3cd55
+    Reviewed-on: https://code.wireshark.org/review/6722
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 5eec6bb
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Dec 1 14:57:07 2014 +0100
+commit 0671965
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Jan 21 15:12:40 2015 -0500
 
-    multipart: Handle multipart/signed
+    usb-hid: fix 2 minor bugs and some dead initializers
     
-    Change-Id: I39742dcce79fc41344c64e5266304c8c120aeb7c
-    Reviewed-on: https://code.wireshark.org/review/5557
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 325014a
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Mon Dec 1 14:47:02 2014 +0100
-
-    multipart: Don't include boundary in preamble.
+    One bug was introduced in g4d58904
     
-    Change-Id: I2d2fd28462b974e4ad656e36f2562633d0743962
-    Reviewed-on: https://code.wireshark.org/review/5556
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I16a5e83f11f48038945e957c7e6ce9d50b4aec46
+    Reviewed-on: https://code.wireshark.org/review/6721
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 9441909
+commit 32ab59f
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Dec 1 23:08:50 2014 -0500
-
-    dftest: load plugins so plugin display filters can also be tested.
-    
-    Change-Id: Ideab88b525cf58b05502f11fb1cf0f58b2864c42
-    Reviewed-on: https://code.wireshark.org/review/5566
+Date:   Wed Jan 21 14:27:46 2015 -0500
+
+    synphasor: General cleanup
+    
+    - col_...() shouldn't be under 'if (tree)';
+    - remove dead initializers;
+    - use proto_tree_add_subtree() in place of ..._add_text()/...add_subtree()
+       in one more instance;
+    - tvb_length() --> tvb_reported_length();
+    - use 'proto tree *' variable instead of incorrect 'proto_item *' var in
+       one instance;
+    - use SYNP_... for a few macro names to prevent any possible
+       namespace collisions;
+    - fix some long-lines, indentation and whitespace.
+    
+    Change-Id: I4e0a2e5d0b5e13b72a14ec6dd3779a7104534445
+    Reviewed-on: https://code.wireshark.org/review/6720
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit d643325
+commit 009ca9f
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Dec 1 12:13:03 2014 -0500
+Date:   Wed Jan 21 11:41:34 2015 -0500
 
-    alljoyn: Rename some filters; Fix some filter types.
-    
-    Details:
-     - Rename various "alljoyn.header..." display filter
-        names releated to the alljoyn "message header"
-        to "alljoyn.mess_header..." to distinguish
-        the fields from actual alljoyn "header" fields.
-        This also fixes the duplicate use of the display
-        filter name "alljoyn.header".
-     - Don't use FT_PROTOCOL for a field type.
+    srvloc: fix a very minor bug
     
-    Change-Id: Id4e78f36716cf6064638aecd5faf561bcbc88b46
-    Reviewed-on: https://code.wireshark.org/review/5561
-    Petri-Dish: Bill Meier <wmeier@newsguy.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Joe Huffman <jhuffman@codeaurora.org>
+    Change-Id: I822602c569fd6241757ceb558224c255937f3130
+    Reviewed-on: https://code.wireshark.org/review/6719
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 05c1aa2
-Author: Yann Lejeune <ylejeune@netyl.org>
-Date:   Mon Dec 1 19:08:31 2014 +0100
+commit 3dc1b4e
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Wed Jan 21 11:38:33 2015 -0500
 
-    BGP: fix dissection of BGP community tag
+    ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *'
     
-    The offset used for BGP community tag dissection is a wrong one.
-    
-    Bug: 10746
-    Change-Id: I1d1d443568bb97a0b3b95a312762ac0a3102326a
-    Reviewed-on: https://code.wireshark.org/review/5562
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d
+    Reviewed-on: https://code.wireshark.org/review/6718
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 6d207fe
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Nov 24 10:10:12 2014 -0500
+commit e1f4f53
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Wed Jan 21 15:00:56 2015 +0100
 
-    Remove private_data member from packet_info structure.
-    
-    Dissectors should pass data directly to their subdissectors through the data parameter (of new-style dissectors). This avoids unintentional "trampling" from other dissectors trying to "share" private_data member.
+    HPFEEDS: cleanup in the dissector code.
     
-    Change-Id: I2efef5c8dfeef64588ba3ac6e695b469238c6468
-    Reviewed-on: https://code.wireshark.org/review/5487
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ia675fb703811c4b6be6a278d9396a917dfcf982d
+    Reviewed-on: https://code.wireshark.org/review/6715
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit e77507b
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Dec 1 00:18:41 2014 -0500
+commit fb1e149
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jan 21 08:41:19 2015 -0800
 
-    Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.
+    NSIS: Simplify wireshark.nsi.
     
-    Part 3 of many, but this concludes the strict conversion to proto_tree_add_bitmask.  Patches to follow with use proto_tree_add_bitmask_xxx (some functions still need to be written)
+    Replace a pile-o-ifdefs with generated include files. This should make
+    it easier to add an NSIS target to CMake.
     
-    Change-Id: Ic2435667c6a7f1d40602124e5044954d2a296180
-    Reviewed-on: https://code.wireshark.org/review/5553
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 542439e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Dec 1 10:29:29 2014 +0100
-
-    SNA: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Drop ICONV_DIR and ADNS_DLL. We haven't used either for quite a while.
     
-    Change-Id: I7a491488e67890c6cde98beec6a4935b10505afb
-    Reviewed-on: https://code.wireshark.org/review/5555
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I71b08cccdb9fe2b2a166b63848a9ded5ebc5f873
+    Reviewed-on: https://code.wireshark.org/review/6717
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 0415df8
-Author: Marko Hrastovec <marko.hrastovec@gmail.com>
-Date:   Mon Dec 1 09:43:26 2014 +0100
+commit 163071e
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Wed Jan 21 10:06:33 2015 +0100
 
-    Asterix: fix Coverity scan (1025624 & 1025625: Missing break in switch)
-    
+    GSM SIM: for a FETCH command, a Le of 0 means 256 bytes
     
-    Two comments are added to the code to notify Coverity scan that breaks are not put in switch statement intentionally.
-    
-    Change-Id: Ie391790ee7365da56ddf0bf7b19042c9a11efddd
-    Reviewed-on: https://code.wireshark.org/review/5554
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ia8969747c215a5ba7e9242b6266114b0e9e00859
+    Reviewed-on: https://code.wireshark.org/review/6712
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 4f9af86
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 30 12:51:30 2014 -0500
+commit 17a1748
+Author: Josip Medved <jmedved@jmedved.com>
+Date:   Tue Jan 20 23:42:17 2015 -0800
 
-    Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.
+    Updated NSN dictionary with vendor-specific Sy application AVPs.
     
-    Part 2 of many
-    
-    Change-Id: I50815e7738b011382392f3078a7107d3d9eec4ec
-    Reviewed-on: https://code.wireshark.org/review/5542
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35
+    Reviewed-on: https://code.wireshark.org/review/6705
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 86c659c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 30 15:53:45 2014 -0500
+commit 6c728d5
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Wed Jan 21 01:00:43 2015 -0800
 
-    Improve checkfiltername.pl for pre-commit script.
-    
-    1. Bugfix grep statement checking if file is "autogenerated"
-    2. Add to the list of "whitelist" duplicates.  Many more were found after #1 was changed.
+    Support Sun^WOracle C's -xldscope=hidden for hiding externals.
     
-    Change-Id: Idea764c0c8b5fa4f30c9acaab9ba10340834d4f5
-    Reviewed-on: https://code.wireshark.org/review/5547
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Id9c852f384a4450b82c8d596f4628d1ccbcf95bc
+    Reviewed-on: https://code.wireshark.org/review/6707
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 90977c7
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 30 16:17:26 2014 -0500
+commit 2ee0ea0
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jan 20 23:22:40 2015 +0100
 
-    Update display filter names per checkfiltername.pl
+    IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8)
     
-    Change-Id: I7694a6f8d8ccec3109fb86ccefee5798de57757d
-    Reviewed-on: https://code.wireshark.org/review/5548
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3
+    Reviewed-on: https://code.wireshark.org/review/6695
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit cd14ff3
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Nov 29 19:32:30 2014 +0100
+commit ed413e9
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jan 20 21:44:49 2015 -0500
 
-    qt: use qstring_strdup
+    Link only the GUIs with SBC (if we have SBC).  The other programs don't
+    (yet) use libcodec.
     
-    Replaces the more verbose `g_strdup(foo.toUtf8().constData())` by
-    `qstring_strdup(foo)`. While at it, plug a minor memleak in
-    MainWindow dialogs.
+    Also, there's no need to explicitly call pkg-config to get SBC's
+    CFLAGS and LIBS: PKG_CHECK_MODULES does that for you.
     
-    Change-Id: I32b53f972b4e3998ac9beabd98647a381b7b42e3
-    Reviewed-on: https://code.wireshark.org/review/5531
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ia7aa84bb81b8223773661ae2dc663731acaf6c6b
+    Reviewed-on: https://code.wireshark.org/review/6700
+    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 0cf2f74
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 30 17:03:20 2014 -0800
+commit 46fabdc
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Tue Jan 20 22:00:24 2015 -0500
 
-    Squelch another compiler warning.
+    Make the license tag in the RPM more specific: Wireshark is GPLv2+.
     
-    Change-Id: Ib79bb30e67dacdda2e87f39438c4a836632d55bd
-    Reviewed-on: https://code.wireshark.org/review/5552
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e
+    Reviewed-on: https://code.wireshark.org/review/6701
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit cc0b083
+commit bc86257
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 30 17:00:04 2014 -0800
+Date:   Tue Jan 20 23:27:08 2015 -0800
 
-    Squelch a compiler warning.
+    Also support -xarch=sse_42 in the Sun C compiler for x86(-64).
     
-    Change-Id: Ic904f9b8551353192e872cb896f198572da83e27
-    Reviewed-on: https://code.wireshark.org/review/5551
+    Change-Id: Ib6d0ae9c237b96568e2522d2077b311b3ac5af2e
+    Reviewed-on: https://code.wireshark.org/review/6706
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ff18b35
+commit db6f733
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 30 16:57:09 2014 -0800
+Date:   Tue Jan 20 20:39:09 2015 -0800
 
-    Fix compile error.
+    Always set the COMPILE_FLAGS property, so we can always fetch it.
+    
+    If we aren't adding -Werror, just set it to a null string, so when we
+    fetch it to add the SSE 4.2 flag to it for ws_mempbrk_sse42.c, it
+    doesn't fail.
     
-    Change-Id: I858248e252a09f4348e7ab88bef81c8452f39051
-    Reviewed-on: https://code.wireshark.org/review/5550
+    Change-Id: I53858130c025e094ed8d0d975451961506fb1a39
+    Reviewed-on: https://code.wireshark.org/review/6704
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 18f0109
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sat Nov 29 19:29:26 2014 +0100
+commit 41cbbc2
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Jan 20 20:32:27 2015 -0800
 
-    qt: fix use-after-free pattern
-    
-    qstring.toUtf8() returns a QByteArray object and .constData() returns
-    a pointer inside that object. It is not safe to store this pointer as
-    it will become invalid after the statement. Store a const reference
-    instead. (Due to scoping differences, some are copy-assigned though.)
-    
-    In the UAT dialog, strlen(bytes.constData()) has also been replaced by
-    bytes.size() as an optimization.
+    Don't set SSE4_2_FLAG to -msse4.2 unless -msse4.2 works.
     
-    Caught by ASAN.
-    
-    Change-Id: Ie09f999a32d0ef1abaa1e658b9403b74bedffc37
-    Reviewed-on: https://code.wireshark.org/review/5528
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I54eca86d53dc0e4015a15491b9adfdfe9ef9e346
+    Reviewed-on: https://code.wireshark.org/review/6703
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 846bb53
+commit 8a0bd92
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 30 16:30:19 2014 -0800
+Date:   Tue Jan 20 19:17:36 2015 -0800
 
-    Add a Buffer to wtap_pkthdr to hold file-type-specific packet metadata.
+    Check whether we can use nmmintrin.h.
+    
+    If we think the compiler supports SSE 4.2, check whether we can use
+    nmmintrin.h if we tell the compiler to compile with SSE 4.2 support; if
+    not, disable SSE 4.2 support.
     
-    For example, this can be used for pcap-ng options not mapped to
-    file-type-independent metadata values.
+    This matches what we do in autotools.
     
-    Change-Id: I398b324c62c1cc1cc61eb5e9631de00481b4aadc
-    Reviewed-on: https://code.wireshark.org/review/5549
+    Change-Id: I474d53d2fe7e2628faca7309efd7155b63bd7eab
+    Reviewed-on: https://code.wireshark.org/review/6702
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 35b1bc5
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 30 20:29:34 2014 +0100
+commit 8051657
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Mon Jan 12 15:16:03 2015 -0500
 
-    win32: use target file format when checking if it supports comments
+    Modernize the description of Wireshark given in the RPM info.
     
-    Bug: 10656
-    Change-Id: Ib74f213630d6d382118c09b3cbf998b28cbc045e
-    Reviewed-on: https://code.wireshark.org/review/5544
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    The initial suggestions came from Michal Labedzki on
+    https://code.wireshark.org/review/#/c/4178
+    
+    Change-Id: Iae04d667f70ae73b46d2edc1645c238ef6efc518
+    Reviewed-on: https://code.wireshark.org/review/6511
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Niels de Vos <devos@fedoraproject.org>
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 6c7af1d
+commit 64f4287
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 30 11:27:18 2014 -0800
+Date:   Tue Jan 20 18:46:10 2015 -0800
 
-    Change some names to make them the same in multiple lists.
+    Get rid of trailing blank.
     
-    Change-Id: I20ca39f69052b4134147577ae5be74c05b4d5e48
-    Reviewed-on: https://code.wireshark.org/review/5543
+    Change-Id: Ia1bbd632fe00cfe6b919aacc0cd198953211fe7f
+    Reviewed-on: https://code.wireshark.org/review/6699
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 10046cc
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 30 08:05:01 2014 -0800
-
-    [Automatic manuf, services and enterprise-numbers update for 2014-11-30]
-    
-    Change-Id: I582091ce31fdd9e961b1000c2b58ef6cb2adca0d
-    Reviewed-on: https://code.wireshark.org/review/5539
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
-
-commit 090a046
+commit bf23953
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 29 16:57:20 2014 -0800
+Date:   Tue Jan 20 18:44:17 2015 -0800
 
-    Update to reflect current reality.
+    Only turn -msse4.2 on for ws_mempbrk_sse42.c, and don't always build it.
+    
+    Move all the SSE 4.2 stuff to wsutil/CMakeLists.txt.
+    
+    Don't put ws_mempbrk_sse42.c in WSUTIL_FILES by default; add it if we
+    think the compiler supports compiling for SSE 4.2.
     
-    Change-Id: I6defd7ffe92e9e07f4ff41166449d5a086800846
-    Reviewed-on: https://code.wireshark.org/review/5538
+    Add -msse4.2 to its COMPILE_FLAGS, but don't add it to any other
+    compiler flags - we don't want to build anything else with -msse4.2 by
+    default, as the only code that uses SSE 4.2 instructions but *only* does
+    so if the processor supports it is our mempbrk implementation.  (And
+    *add* it, don't *replace* the existing flags with -msse4.2; that way,
+    -Werror is left in there as well.)
+    
+    Change-Id: I979b37a37e4b88b3af11e2275e89441118c8ce0a
+    Reviewed-on: https://code.wireshark.org/review/6698
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e28a847
+commit f215102
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 29 15:01:34 2014 -0800
+Date:   Tue Jan 20 16:29:06 2015 -0800
 
-    Fix tfshark.c to match changes to epan/print.[ch].
+    Handle CFLAGS disabling SSE 4.2.
+    
+    When checking whether nmmintrin.h works, add -msse4.2 at the *beginning*
+    of CFLAGS, so that user (or Gentoo build process) settings with
+    -mno-sse4.2 override it.
     
-    Change-Id: I765cd0dbb5451b578ccabd221afc477a6559e60c
-    Reviewed-on: https://code.wireshark.org/review/5537
+    Bug: 10792
+    Change-Id: I1b77c2a092360a86bc7012d29642ff3303b60812
+    Reviewed-on: https://code.wireshark.org/review/6696
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 81ab601
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 29 14:43:22 2014 -0800
+commit 5f70fd6
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Tue Jan 20 16:44:10 2015 -0500
 
-    Clean up routine names, don't pass capture_file into libwireshark.
+    dsi: fix a trivial bug
     
-    Give all routines in epan/print.c that write a particular format a name
-    beginning with write_{formatname}.
-    
-    If routines write columns, rather than the raw protocol tree, don't give
-    it a name containing proto_tree.
-    
-    Get rid of empty preamble/finale routines.
+    Change-Id: Ieafbd148211154a465ab1ce8fe36d2110882c458
+    Reviewed-on: https://code.wireshark.org/review/6694
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit d2d699a
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Tue Jan 20 10:05:06 2015 -0500
+
+    Move all SigComp functionality to the SigComp dissector.
     
-    For CSV, the preamble routine writes out column titles, so call it
-    write_csv_column_titles().
+    While it does make packet-sigcomp.c much bigger, there's no reason for it to be in epan directory.
     
-    For C arrays, the body routine writes out raw hex data, so call it
-    write_carrays_hex_data().
+    Change-Id: I2d78c32de1d56e76578e610d4df586b5610d1b49
+    Reviewed-on: https://code.wireshark.org/review/6682
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 160af3c
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jan 20 22:20:54 2015 +0100
+
+    HTTP2: fix test failure on Solaris SPARC
     
-    capture_file isn't a structure defined by libwireshark, so don't make it
-    an argument passed into libwireshark.
+    Do not make any assumption on the endianness: not all hosts running Wireshark are little endian
     
-    Change-Id: I5a7e04de9382cf51a59d9d9802f815b8b3558332
-    Reviewed-on: https://code.wireshark.org/review/5536
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8792904f7000b4f2b9e44ffe41f350ba8b4932d4
+    Reviewed-on: https://code.wireshark.org/review/6693
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 05516b0
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 29 15:41:12 2014 -0500
+commit 74ed8b5
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 19 13:10:59 2015 +0100
 
-    Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.
+    Add DNS stats to release-notes
     
-    Part 1 of many
+    Remove in NEWS by gca174999
     
-    Change-Id: I77a5789ac23388e6a5f8098dc398592f39638124
-    Reviewed-on: https://code.wireshark.org/review/5532
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I000b7d6421db247dcafacfa73ef049e938d42cc5
+    Reviewed-on: https://code.wireshark.org/review/6650
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit e399382
+commit 0169cc8
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Nov 29 17:01:30 2014 -0500
+Date:   Tue Jan 20 15:26:54 2015 -0500
 
-    Rename some hf[] display filter names to fix dups.
+    Remove some dead initializers
     
-    Change-Id: Ibe932bc37e03194f1801ec4eed4da1ff31370de3
-    Reviewed-on: https://code.wireshark.org/review/5535
+    Change-Id: I0478fa5c476a1914ae0c18feafc7720dd3111d84
+    Reviewed-on: https://code.wireshark.org/review/6690
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 1aeab74
+commit eefd529
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Sat Nov 29 17:00:07 2014 -0500
+Date:   Tue Jan 20 15:23:50 2015 -0500
 
-    ieee80211; Rename some hf[] display filter names to fix dups and for clarity.
+    bpdu: Fix minor bug introduced in g188aa9a
     
-    Change-Id: Ibcca2d7f85130b4a5a74808d88735513cfc0b580
-    Reviewed-on: https://code.wireshark.org/review/5534
+    Change-Id: Ibce8848dded5896223af117a85bc0b6e321160e8
+    Reviewed-on: https://code.wireshark.org/review/6689
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 785ef83
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 29 07:26:42 2014 +0000
+commit 2c312b6
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Tue Jan 20 14:47:23 2015 -0500
 
-    Revert "Add QNX' QNET protocol"
-    
-    This reverts commit 72b91a56f86e3bbab700900366f81dc8c353b91d.
-    
-    value_string_ext tables ***MUST*** be sorted numerically, otherwise the code prints warnings such as the ones in
-    
-        http://buildbot.wireshark.org/trunk/builders/Ubuntu%2014.04%20x64/builds/1419/steps/test.sh/logs/stdio
-    
-    Fix this and resubmit.
+    acn: col_...() shouldn't be called under 'if (tree)'
     
-    Change-Id: I448025bb7b19a607e992831202ed31d243ce70d8
-    Reviewed-on: https://code.wireshark.org/review/5530
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I4d7d1826391b0ac12ef6ad184e7c79d279db5e28
+    Also: remove some dead initializers.
+    Reviewed-on: https://code.wireshark.org/review/6688
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 1429986
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 28 23:10:44 2014 -0800
+commit c0a403a
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Tue Jan 20 14:18:53 2015 -0500
 
-    Sadly, index() was the name of a routine in V7, so....
+    6lowpan: Fix a few minor bugs; Also: Misc
     
-    Change-Id: Id83899de08e0ad8e5664dddfb6ca268e7d0bd54d
-    Reviewed-on: https://code.wireshark.org/review/5529
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    (Bugs were introduced in gf5e2b42);
+    Misc:
+        Localize a few variables;
+        Remove some dead initializers.
+    
+    Change-Id: Ib7493740ecf29ed9f753475f721b47a64f54a278
+    Reviewed-on: https://code.wireshark.org/review/6687
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 72b91a5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Jun 17 17:03:11 2014 +0200
+commit f63628d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jan 20 09:43:33 2015 -0800
 
-    Add QNX' QNET protocol
+    CMake: Use wrapper scripts instead of symlinks.
     
-    no ethertype 0x8203-0x8205 support in trunk.
-    0x8204 is QNX OS VER 6's qnet ethernet protocol number.
+    When building an application bundle, create wrapper scripts at the top
+    level instead of symlinking to each executable.
     
-    Bug:3934
-    Change-Id: I5f3e910876bb7fb86de2111f856d026fdf220917
-    Reviewed-on: https://code.wireshark.org/review/2954
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I080e43de545a709b29c1d6b6c6ec416e5a5a8247
+    Reviewed-on: https://code.wireshark.org/review/6683
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 8e17fd6
-Author: cbontje <cbontje@gmail.com>
-Date:   Thu Nov 20 15:13:37 2014 -0700
+commit 5268d7f
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Tue Jan 20 12:51:08 2015 -0500
 
-    Add optional user Fast SER preference for SEL Fast Message Protocol
+    cattp: Minor tweaks and whitespace changes
     
-    * Also cleanup description of remaining preferences
+    Change-Id: I128318ffb385930f00675030227e0048306a9f4c
+    Reviewed-on: https://code.wireshark.org/review/6684
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit 6e6a129
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sun Jan 18 13:27:13 2015 -0800
+
+    CMake: Set an output directory for plugins.
     
-    See Bug 10719
+    Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all
+    platforms. Add WiresharkPlugin.cmake so that we can start defining common
+    macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds.
     
-    Change-Id: I81faba77d8b88b24c65156f5139067233869154b
-    Reviewed-on: https://code.wireshark.org/review/5416
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2
+    Reviewed-on: https://code.wireshark.org/review/6640
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit ca95800
+commit af3924a
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Nov 27 16:23:58 2014 +0100
+Date:   Thu Jan 8 17:04:05 2015 +0100
 
-    Endpoint: wrong filter when select a TCP endpoint (INVALID == a.x.y.z ...)
+    HTTP2: Add HPACK decode to test suite
     
-    Change-Id: If56209f1274245f54100d0acfaf14098c8df4582
-    Reviewed-on: https://code.wireshark.org/review/5520
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ic84942b78a795974d6e2023751245ad98b8f1142
+    Reviewed-on: https://code.wireshark.org/review/6415
+    Reviewed-by: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f1b37bc
+commit b2e172a
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Nov 27 12:29:13 2014 +0100
+Date:   Tue Jan 13 10:41:32 2015 +0100
 
-    Endpoint: wrong filter when select a UDP endpoint (INVALID == a.x.y.z ...)
+    DHCP/BOOTP: Option 125 Suboption: (5) fix display Modem Capabilities
     
-    Change-Id: Ie46d6c201df0b0164a8bf96c02d6430734fd2948
-    Reviewed-on: https://code.wireshark.org/review/5518
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Only display dissect of Modem Capabilites when sub option = 5
+    Actually, it is always display when ftype == special (like sub option = 0)
+    
+    Change-Id: I5b75654b750bae5ae5022adcb5e8dd055ce6b291
+    Reviewed-on: https://code.wireshark.org/review/6519
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3355ed6
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Tue Nov 25 19:40:12 2014 +0100
+commit f3cbee6
+Author: Evan Huus <eapache@gmail.com>
+Date:   Mon Jan 19 11:55:01 2015 -0500
 
-    elf: fix FDE Count formatting
+    NCP2222: fix possible buffer-overflow
     
-    Displays the FDE Count as a number, not a series of bytes.
+    Caught by ASAN (thanks Alexis!)
     
-    Change-Id: I60dd426cb5305a5001a8200578008b7c4a99c64e
-    Reviewed-on: https://code.wireshark.org/review/5489
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: Ibbe2c405ba1a3ba0d5a5b9ffff9e95282526028b
+    Reviewed-on: https://code.wireshark.org/review/6652
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit e8cda3b
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Tue Nov 25 23:14:50 2014 +0100
+commit 1af7b97
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Mon Jan 19 23:12:25 2015 +0100
 
-    TCP: move Windows Scaling and SCPS checks after options decoding
+    Bug fix in json dissector that made the heuristic fail.
     
-    This was changed in g8881f3f in an attempt to avoid throwing an exception when decoding the options field
-    
-    Bug: 10514
-    Change-Id: Ia4b49f484d6255090c5a6e425a9716b48ccc4cb5
-    Reviewed-on: https://code.wireshark.org/review/5495
+    Change-Id: Iff53cfd8fd9d760b04c638c87f8a44587b268cd7
+    Reviewed-on: https://code.wireshark.org/review/6674
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit afcdff0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Nov 27 11:11:18 2014 +0100
+commit 11e557a
+Author: Matthieu Texier <matthieu@texier.tv>
+Date:   Thu Jan 15 18:24:20 2015 +0100
 
-    Endpoint dialog (Qt): Add missing text to translate
+    ISIS: Making a segregated function for sub-tlv used by multiple tlv
     
-    Change-Id: I375b348b6d6e35c212f76fc73135990a93560a75
-    Reviewed-on: https://code.wireshark.org/review/5517
+    Change-Id: Ifda28dea4b5282ea01a51cdcb3297aeeeb2a848d
+    Reviewed-on: https://code.wireshark.org/review/6550
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a67d0d2
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Nov 27 22:33:22 2014 -0500
+commit 8c15ac4
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jan 19 18:32:42 2015 -0800
 
-    Eliminate proto_tree_add_text from packet-sna.c.
-    
-    Also convert many of the proto_tree_add_boolean calls into proto_tree_add_bitmask.
+    Possibility -> certainty.
     
-    Change-Id: I1fb2f943abed28434a2aadc48eb7e9ffb766f463
-    Reviewed-on: https://code.wireshark.org/review/5523
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I03440a9b4ca13399aa14f3baaabd7aa40a843f28
+    Reviewed-on: https://code.wireshark.org/review/6678
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 3f85761
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 26 20:08:07 2014 +0100
+commit f16e8fb
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jan 19 13:33:01 2015 -0800
 
-    RADIUS: Sync with FreeRADIUS Master
-    
-    commit 30dac6d3dc87aaaa9c29ecdb33874fa57c2bcbc6
-    Author: Alan T. DeKok <aland@freeradius.org>
-    Date:   Tue Nov 25 16:45:45 2014 -0500
-    
-        as found on the net
+    pdb_zip_package: Enable multithreaded compression.
     
-    commit ee79c59d3a1cae76fcb1940710d9a0f7fbdf8427
-    Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
-    Date:   Thu Nov 13 17:39:46 2014 -0500
-    
-        Add memcached rlm_cache_driver
-    
-    commit 6277960bc830891123b00400af56912e51d4d311
-    Author: Alan T. DeKok <aland@freeradius.org>
-    Date:   Tue Oct 28 17:01:49 2014 -0400
-    
-        Add FreeRADIUS-Response-Delay-USec
-    
-    Change-Id: I705d0e852d38eaace4f71cfc0a38ecdd41c0b58f
-    Reviewed-on: https://code.wireshark.org/review/5510
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: If72c65663abb7e3bf1a436d1ecb5eb84f67ad3f8
+    Reviewed-on: https://code.wireshark.org/review/6677
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 8839d7b
+commit c3ad53f
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 27 16:07:16 2014 -0800
+Date:   Mon Jan 19 16:47:55 2015 -0800
 
-    Make the ENTTEC dissector reject packets that don't look like ENTTEC packets.
+    Fix one item.
     
-    This should avoid questions like
+    We *do* get the absolute path of the executable, so we *could* look for
+    "run" right before the executable name.  The issue is that there's not
+    the stronger libtool-imposed convention that the executable is in
+    ".libs", so the chances of a false positive or false negative are
+    higher.
     
-       https://ask.wireshark.org/questions/38198/what-is-enttec-in-a-pcap-file
+    Change-Id: Ib2d5f370d50fee07479c4ffe6f90ba4a91c7f271
+    Reviewed-on: https://code.wireshark.org/review/6676
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 7c69079
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jan 19 13:33:01 2015 -0800
+
+    CMake: Add a pdb_zip_package target.
     
-    It also splits DMX-over-UDP and DMX-over-TCP into separate dissectors,
-    as
+    Add a "pdb_zip_package" target similar to the NMake pdb_zip target.
     
-       1) DMX-over-TCP has only config packets, DMX-over-UDP has the
-          others;
+    Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9
+    Reviewed-on: https://code.wireshark.org/review/6673
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+
+commit bea25fa
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jan 19 13:10:22 2015 -0800
+
+    The times in question are local, not UTC.
     
-       2) that would let us do reassembly, if necessary, for
-          DMX-over-TCP.
+    Revert to the older code, but just show the time as "Not representable"
+    if gmtime() fails.
     
-    Change-Id: I2606c814693028c7ba2bbc458e45c853372baaf3
-    Reviewed-on: https://code.wireshark.org/review/5522
+    Change-Id: I435facc042e3ca35fb07292a4b2657ccdfd02abb
+    Reviewed-on: https://code.wireshark.org/review/6672
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a30f3d5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 26 16:38:30 2014 +0100
+commit 58d9ca8
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jan 11 16:46:36 2015 +0100
 
-    Qt: Add long option for -R (--read-filter) and -Y (--display-filter)
+    add some more apdus to the apdu table
     
-    Change-Id: Id535c04493f6c6df88006d922ee43cff9f4b70a1
-    Reviewed-on: https://code.wireshark.org/review/5507
+    Change-Id: Id5e5efea46e9ff6196607e56f0212fb083e8635c
+    Reviewed-on: https://code.wireshark.org/review/6670
     Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit b4b6a5d
-Author: Enrico Jorns <ejo@pengutronix.de>
-Date:   Fri Sep 26 12:07:03 2014 +0200
+commit 6c02abf
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jan 11 15:14:21 2015 +0100
 
-    canopen: LSS dissection
+    start dissecting the ZVT authentication apdu
     
-    Dissection of Layer setting services (LSS) sub-protocol
-    according to CiA 305.
+    add a length paramenter to the body dissection functions in the apdu table
     
-    Change-Id: I24ca1827b25c30a672fb31cad390b3c1486102f4
-    Reviewed-on: https://code.wireshark.org/review/5516
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I4abbd9078fd36385a816963ab042f443e3c26b60
+    Reviewed-on: https://code.wireshark.org/review/6669
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 608d83c
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Thu Nov 27 11:24:40 2014 +0100
+commit 4fc8286
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jan 11 13:41:27 2015 +0100
 
-    LEX and YACC are required
+    display the control field text in the info col
     
-    When building both LEX (flex) and YACC (bison or yacc) are required to generate C files from l(ex) and y(acc) files
+    Change-Id: I3dc0f58b4861a08be687214cae9c6681ebcac286
+    Reviewed-on: https://code.wireshark.org/review/6668
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+
+commit c846af1
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jan 11 12:45:39 2015 +0100
+
+    continue the dissection of ZVT APDUs
     
-    Change-Id: I8892a05eb437d0bef613b68f681225df2cb2c6b4
-    Reviewed-on: https://code.wireshark.org/review/5515
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    define an apdu table with the direction, minimum length
+    and a fuction to dissect the apdu payload
+    
+    set the source and destination address columns depending on the apdu
+    
+    add some entries to the apdu table
+    
+    Change-Id: I52bd15bfab7bbe6c97dfe64084e69a51e65a8a6e
+    Reviewed-on: https://code.wireshark.org/review/6667
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 121d9ae
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 27 00:15:24 2014 -0800
+commit 71d83aa
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Mon Jan 19 07:04:48 2015 +0100
 
-    Note that this document is a bit old.
+    tvb_length() -> tvb_captured_length()
     
-    Change-Id: Ie9a45acf1d3bc116d73b6430b058ffdcabead42b
-    Reviewed-on: https://code.wireshark.org/review/5514
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I520b38ed37b2d16d9a15f57b8e83b0b59c9a528c
+    Reviewed-on: https://code.wireshark.org/review/6666
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 4469346
+commit 0dcb91d
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 26 20:41:16 2014 -0500
+Date:   Mon Jan 19 15:38:29 2015 -0500
 
-    Fix a number of dup hf[] filter-names probably mostly resulting from cut/paste errs
+    synphasor: (trivial) Do dissector_add_uint("rtacser.data",...) only once
+    
+      and not each time prefs are changed.
+    
+      Also: do minor whitespace changes.
     
-    Change-Id: Id658b9e1803b2f5b92e711a3ce981ff602333d98
-    Reviewed-on: https://code.wireshark.org/review/5513
+    Change-Id: I04bfc212e288473a78113e8b124ce4a13ad74ad1
+    Reviewed-on: https://code.wireshark.org/review/6663
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit c28f280
+commit 5fa13c6
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 26 18:18:57 2014 -0500
+Date:   Mon Jan 19 15:32:45 2015 -0500
 
-    Fix a number of dup hf[] filter-names probably resulting from cut/paste errs.
+    README.dissector: Minor update re date/time display.
     
-    Change-Id: I9242300b2ace3155c1506b584a90f073100a305e
-    Reviewed-on: https://code.wireshark.org/review/5512
+    Change-Id: Iae467efeccd2e51ea66aab029100c958de7d374e
+    Reviewed-on: https://code.wireshark.org/review/6662
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit cc893ab
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Nov 26 23:01:48 2014 +0100
+commit 7a81add
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Mon Jan 19 15:19:46 2015 -0500
 
-    XML: pass XML structure to caller through p_(add|get)_proto_data functions
+    synphasor: prevent possible crash; gmtime() can return NULL;
     
-    Since ge3a04bb data parameter is used for the media-type string
+    Don't do manual conversion of a time-field to UTC using gmtime().
+    Use the standard Wireshark mechanisms.
     
-    Bug: 10729
-    Change-Id: I3df640079a8bf57f4bd86a1baa08cbf9a3a7e1b3
-    Reviewed-on: https://code.wireshark.org/review/5511
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I2eaee074a590ecab492336bb6ad794bdd036f699
+    Reviewed-on: https://code.wireshark.org/review/6661
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit c2913d2
-Author: Enrico Jorns <ejo@pengutronix.de>
-Date:   Thu Sep 25 12:53:26 2014 +0200
+commit 7e1d73d
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Mon Jan 19 15:15:45 2015 -0500
 
-    canopen: Enhanced SDO decoding
-    
-    * Move sdo dissection to separate function
-    
-      Added dissect_sdo() function to handle the more complex SDO dissection.
-    
-    * SDO command specifier decoding
-    
-      Decoding of both client and server command specifier for SDO transfers
-      according to CiA 301 Chaper 7.2.4.3.
-    
-      Note: Fully decoding block transfer frames is more complex and not supported
-      yet.
+    dmp, gmhdr, vssmonitoring: prevent possible crashes;
     
-    * basic SDO abort code decoding
+    gmtime()/localtime() can return NULL.
     
-      SDO abort codes as specified in CiA 301 Chapter 7.2.4.3.17 (Table 22).
+    Change-Id: If0589261429ee15d0c07972a99d94f9fe83626f6
+    Reviewed-on: https://code.wireshark.org/review/6660
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit d1cace9
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Mon Jan 19 15:03:23 2015 -0500
+
+    smb-pipe: prevent possible crash; gmtime() can return NULL.
     
-    * Basic value ranges for object dict index parameter
+    For FT_ABSOLUTE_TIME fields:
     
-      Object dict ranges as specified in CiA 301 7.4.1 (Table 41)
+    Instead of calling gmtime()/mktime() to convert a time to UTC time
+    which is then displayed using proto_tree_add_time(),
     
-    * cs-based multiplexer and data decoding
+    Use ABSOLUTE_TIME_UTC as the 'display' value for the field and then
+    display the field using proto_tree_add_item().
     
-      A data width of 4 byte is valid only for expedited transfer and a
-      multiplex value is present only in initialisation messages.
+    Change-Id: I1926c40de76a86072437902cb7621d3873827b11
+    Reviewed-on: https://code.wireshark.org/review/6659
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+
+commit b41065e
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 19 21:28:52 2015 +0100
+
+    BGP: EVPN - Route Type 4 - "Invalid length of IP Address" - "Expert Info" shows a false error
     
-      This patch now handles also normal sdo segment data.
+    Wrong offset (14 -> 20) to get IP Address Legnth
     
-      Reference: CiA 301, Chapter 7.2.4.3.3 and 7.2.4.3.6
+    Issue Reported by Rui
+    Bug: 10873
     
-    Change-Id: I37005894082d62eed1ddd85e09e3676aa3af8222
-    Reviewed-on: https://code.wireshark.org/review/5504
+    Change-Id: Ib7aa80ac78028a2c8d548f4030278166be9ed0cc
+    Reviewed-on: https://code.wireshark.org/review/6657
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit d77c5a5
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Wed Nov 26 10:09:03 2014 -0700
-
-    Update the URL for the CPUID instruction documentation.
-    
-    Change-Id: I9729b3aa11027783a3557468743e91e180a6de8d
-    Reviewed-on: https://code.wireshark.org/review/5509
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
 
-commit a159ced
+commit 9fd5078
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 26 15:20:27 2014 +0100
+Date:   Mon Jan 19 21:28:04 2015 +0100
 
-    WCCP: Remove uneeded check (pinfo & info_tree)
+    BGP: fix  field bgp.evpn.nlri.mpls_ls is not of type FT_STRING, FT_STRINGZ, or FT_STRINGZPAD
     
-    Remove also some false positive Dereference of null pointer
-    
-    Change-Id: I09687993531827c6e4f5178f3414ddd9a2702038
-    Reviewed-on: https://code.wireshark.org/review/5506
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: Ida14611dee9eb01e1eab13a96c15ab3d759ed1cd
+    Reviewed-on: https://code.wireshark.org/review/6656
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit a2c2f87
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 16:15:17 2014 -0500
+commit ab8a13d
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Mon Jan 19 12:26:06 2015 -0800
 
-    Remove the use of pinfo->private_data from dissectors that just save it to restore it.
+    Don't mix declarations and code - it's not legal C90.
     
-    Change-Id: I13197cc48068bb35ee12a7023cfe5f76bbc4e264
-    Reviewed-on: https://code.wireshark.org/review/5486
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I1a89c729255560d596e4d7701468cca3e9000357
+    Reviewed-on: https://code.wireshark.org/review/6655
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 449bc19
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 22 12:58:43 2014 +0100
+commit c0fd539
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Mon Jan 19 20:50:12 2015 +0100
 
-    Qt: support the -R option to set a read filter on the command line
-    
-    rename display_filter to read_filter in some places to make it clear
-    what it's used for
+    ZigBee: fix dissection of epoch time in OTA cluster
     
-    modify MainWindow::openCaptureFile() so that a read filter can be set
-    when the file name is passed in cf_path, not only when it's chosen from
-    a file selection dialogue
-    
-    don't display the read filter string in the filter toolbar
-    
-    Change-Id: Ie8dc94cbd1ff7e61ce1e2a55518a28297daa5d51
-    Reviewed-on: https://code.wireshark.org/review/5446
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Bug: 10872
+    Change-Id: I25275ecb76cc03774ab210fb33a3bef5b1982585
+    Reviewed-on: https://code.wireshark.org/review/6653
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 691f647
+commit de4164f
 Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Nov 26 13:36:03 2014 +0100
+Date:   Mon Jan 19 15:24:47 2015 +0100
 
-    [MGCP] When changing tvb_length(tvb) -> tvb_reported_length(tvb) it turns
-    out that tvb_new_subset(tvb, tvb_sectionbegin, sectionlen, -1) causes a
-    problem as reported_length is set to -1, set it to sectionlen.
+    On my system NSIS installs in the path defined in environment variable
+    ProgramFiles(x86)=C:\Program Files (x86)
+    Add that to the locations where we look for it. I couldn't use
+    ProgramFiles(x86) as a constant so put the path verbatim.
     
-    Change-Id: I650d3fa1390be5add66ed44d0f70929b9eb0aad6
-    Reviewed-on: https://code.wireshark.org/review/5505
+    Change-Id: Ibad9d4e2544e5b3924e10c68f02e072b0012226f
+    Reviewed-on: https://code.wireshark.org/review/6651
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit ab8cad28
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 11:54:54 2014 -0500
+commit c8bca4f
+Author: Josip Medved <jmedved@jmedved.com>
+Date:   Mon Jan 19 00:33:22 2015 -0800
 
-    Remove sccp_info member from packet_info structure.
-    
-    sccp_msg_info_t* is now passed from SCCP dissector to its subdissectors through dissector data parameter.
+    Updated company name from Nokia Siemens Networks to Nokia Solutions and Networks.
     
-    Change-Id: Iab4aae58f8995e844f72e02e9f2de36e83589fc0
-    Reviewed-on: https://code.wireshark.org/review/5442
+    Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a
+    Reviewed-on: https://code.wireshark.org/review/6647
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7c47503
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 25 13:49:12 2014 -0500
+commit 1b5a965
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 19 09:46:36 2015 +0100
 
-    openflow: Use (what appear to be the) correct filter names for a few fields.
+    JSMN : fix typo (it will be fix make distcheck)
     
-    Change-Id: I2acd93d99942601b34c85177d21bbc2c4a4e2633
-    Reviewed-on: https://code.wireshark.org/review/5492
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I188be77b77a5a52b233d482d6d8ea8b97adc00db
+    Reviewed-on: https://code.wireshark.org/review/6649
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 5464bc6
-Author: Enrico Jorns <ejo@pengutronix.de>
-Date:   Thu Oct 2 16:09:38 2014 +0200
+commit 48e90da
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 19 08:38:16 2015 +0100
 
-    canopen: Improve NMT error control and SYNC message dissection
-    
-    1.  Also show Reserved/Toggle bit of NMT error control
+    Fix make dist on Ubuntu buildbot
     
-      In case of the node guarding protocol this bit is used as a toggle bit.
-      In case of the hearbeat protocol this bit is reserved.
+    Change-Id: Id3a5ed08fb8b7c721f8eeabbba723a9de0d47b0f
+    Reviewed-on: https://code.wireshark.org/review/6648
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+
+commit f90a10a
+Author: Josef Baumgartner <josef.baumgartner@br-automation.com>
+Date:   Tue Oct 21 13:12:18 2014 +0200
+
+    epl: Rework POWERLINK (EPL) dissector
     
-      Reference: CiA 301 (rev 4.2.0), Chap. 7.2.8.3.2
+     With this patch we want to enable a better support of POWERLINK
+     as a protocol for people who have to perform network diagnostics using
+     analyzing tools. Up until now, the main tool used was Omnipeek.
+     Now wireshark will be used more and more, due to the new extcap
+     infrastructure, which supports debug tools to be added as capture
+     devices.
     
-    2. Show optional 'counter' parameter of SYNC messages if available
+     To better facilitate that change, we have adapted the textual
+     representation of the Omnipeek dissector for POWERLINK, as it
+     allows for a faster and simpler diagnosis routine.
     
-      Reference: CiA 301 (rev 4.2.0), Chap. 7.2.5.3.1
+     Additionally the name of the protocol has been changed to it's
+     correct name "POWERLINK" as this is the official name used by
+     EPSG for describing the protocol.
     
-    Change-Id: I5dc0ab65e95fec4846a9c8bd8972ef2eba664ee2
-    Reviewed-on: https://code.wireshark.org/review/5484
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Changelog:
+     - Add error code definitions and string values.
+     - Change name for protocol column to POWERLINK which is more commonly
+       used than EPL.
+     - Reformat output in info column to look like output the output of
+       the POWERLINK plugin for Omnipeek. This facilitates the transition
+       to Wireshark. The added information and changed output improves the
+       debugging of POWERLINK nerworks.
+    
+    Change-Id: I795e2487f2ae7af6b90c29366a1843c9fabffa85
+    Reviewed-on: https://code.wireshark.org/review/5581
+    Reviewed-by: Roland Knall <rknall@gmail.com>
     Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a559f2a
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Nov 25 20:27:07 2014 -0500
+commit f53be88
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Fri Jan 2 21:33:49 2015 +0100
 
-    dec-dnart: use pinfo-scoped memory for addresses
-    
-    They may be accessed during the print phase, at which point packet-scope memory
-    has already been freed.
+    JSON dissector changed into heuristic dissector.
     
-    Bug: 10724
-    Change-Id: Ifcf5fc0c0857614edf85349b12dfe605abf6fef7
-    Reviewed-on: https://code.wireshark.org/review/5497
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit e843c67
-Author: Evan Huus <eapache@gmail.com>
-Date:   Tue Nov 25 20:16:05 2014 -0500
-
-    wccp: use pinfo-scope memory for addresses
+    To check if a payload is json, the library libjsmn has been added to the source tree, with its licence (MIT).
+    TODO: the libjsmn can be used to extract tokens in the standard dissection other than heurisitic part.
     
-    They may be accessed during the print phase, at which point packet-scope memory
-    has already been freed.
+    HPFEEDS dissector has also been changed in order to leverage the new json dissector.
     
-    Bug: 10720
-    Change-Id: Ia2b160fd9de4ccaa3a4b8d9cb70fb9b32d4e08a0
-    Reviewed-on: https://code.wireshark.org/review/5496
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Bug: 10834
+    Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978
+    Reviewed-on: https://code.wireshark.org/review/6350
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 85ca1cf
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 25 12:39:53 2014 +0100
+commit 119416e
+Author: Luke Mewburn <luke@mewburn.net>
+Date:   Tue Dec 23 18:32:34 2014 +1100
 
-    conversation_table: fix indent (use 4spaces) and add modelines info
+    TCAP: support dialogue confirmation
     
-    Change-Id: I76784f0252dcd095a3016ed014632e2a5c09265b
-    Reviewed-on: https://code.wireshark.org/review/5483
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit f449be8
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 25 12:37:59 2014 +0100
-
-    conversation_table: fix warning when generate documentation (doxygen)
+    TCAP permits the changing of the originating address on the first
+    backwards continue (i.e. the establishment of the dialogue).
+    See ITU-T Q.771 (06/97) clause 3.1.2.2.2.2 Confirmation of the dialogue.
+    In practice, a BEGIN replied to with an END can also exhibit this behaviour.
     
-    epan/conversation_table.h:335: warning: The following parameters of add_hostlist_table_data(conv_hash_t *ch, const address *addr, guint32 port, gboolean sender, int num_frames, int num_bytes, hostlist_dissector_info_t *host_info, port_type port_type_val) are not documented:
-      parameter 'host_info'
-      parameter 'port_type_val'
+    For example, a BEGIN from GT A TID TA -> GT B,
+    and the reply CONTINUE from GT B2 TID TB -> GT A TID TA.
+    To support this, only support a single address hash in
+    tcaphash_begin_info_key_t and tcaphash_end_info_key_t.
+    The match of the first CONTINUE should find the appropriate
+    tcaphash_begin and create the appropriate tcaphash_end entries.
     
-    Change-Id: I6c3b29750c856eb2665981553fcb8eecd8fe34ee
-    Reviewed-on: https://code.wireshark.org/review/5482
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Also fix compile warning with DEBUG_TCAPSRT.
+    
+    Bug: 10841
+    Change-Id: Ibe75e3940e757727357b20be10f9c195c5888fdd
+    Reviewed-on: https://code.wireshark.org/review/6446
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 2ebaa59
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Nov 24 14:51:13 2014 -0600
+commit c4297e6
+Author: Diederik de Groot <ddegroot@talon.nl>
+Date:   Sun Jan 18 00:23:33 2015 +0100
 
-    Consolidate sequence analysis code.
-    
-    Move scattered code for seq_analysis_info_t creation and destruction to
-    tap-sequence-analysis.[ch].
+    Skinny: packet-skinny.c
+    Changes: Number of small changes to the xml file:
+       - some fields being connected to the wrong message version
+       - some header field naming
     
-    Change-Id: I87c14b1c83105a48d0ab149a3abba71e2a2fe21f
-    Reviewed-on: https://code.wireshark.org/review/5479
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I062c31777a4193de3d5c44b0ba733dd9d1702352
+    Reviewed-on: https://code.wireshark.org/review/6602
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 5b360a9
-Author: Yaniv Kaul <mykaul@gmail.com>
-Date:   Tue Nov 25 21:24:23 2014 +0100
+commit 199cb06
+Author: Sergio Moreno Mozota <sergio.morenomozota@telefonica.com>
+Date:   Sat Jan 17 23:24:22 2015 -0500
 
-    SCSI: type and scope fields are ignored in some SCSI persistent reserve service actions
+    RTP: Parse problem in dissect_rtp_hext_rfc5215_onebyte
     
-    Bug: 10727
-    Change-Id: Id34f57b2a0b89867eec1b0a13db2eba037835804
-    Reviewed-on: https://code.wireshark.org/review/5493
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    some commercial IPTV streamers send bogus info in the extension headers, add some sanity check to skip the erroneous bytes.
+    
+    Bug: 10513
+    Change-Id: I6f20073a00ed0f791fa99701534360d304060053
+    Reviewed-on: https://code.wireshark.org/review/6606
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e2ef6c4
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Tue Nov 25 14:44:03 2014 -0700
+commit e333e4c
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jan 17 14:11:29 2015 -0500
 
-    Add on to the dummy.cpp hack that forces wireshark to be linked with a
-    c++ compiler to automatically create a dummy.cpp file and remove it when
-    make clean is issued.  This allows make tags to work again since the
-    file isn't missing.
+    Convert OID APIs to use wmem.
     
-    Change-Id: I17191ad2acc281734fa12da4d347fd3116018f67
-    Reviewed-on: https://code.wireshark.org/review/5494
-    Petri-Dish: Stephen Fisher <sfisher@sdf.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    There are a few oid functions that are only called in oids_test.c.  I'll presume the APIs are used in proprietary dissectors rather than just remove them.
+    
+    Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f
+    Reviewed-on: https://code.wireshark.org/review/6592
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e2132f9
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 25 00:43:06 2014 -0500
+commit 59155d1
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 18 17:48:53 2015 -0800
 
-    openflow: Minor changes
+    Eliminate ep_strdup(), as it's no longer used.
     
-    - Remove unneeded/undefined forward declarations;
-    - Create/use some extended value-strings;
-    - Do some whitespace changes.
+    Also, remove some no-longer-existent functions from checkAPIs.pl.
     
-    Change-Id: I7961864f0e404e141d2887584751116011f8d941
-    Reviewed-on: https://code.wireshark.org/review/5490
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I2bf11e3ec03a34f9e89d58d560e340d76fd3ddc1
+    Reviewed-on: https://code.wireshark.org/review/6645
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 2015398
+commit 5162b7f
 Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 25 12:53:43 2014 -0500
+Date:   Sun Jan 18 18:41:37 2015 -0500
 
-    proto.c: proto_registrar_dump_values(): don't skip "same name" fields.
+    smpp: Prevent crash if invalid date/time field.
     
-    It appears that Wireshark allows (and currently has) fields with the
-    same name with differing "strings" content.
+      gmtime()/localtime() can return NULL;
     
-    Change-Id: Iddac5a2c9f456a97ea676f2007f43d786482eebd
-    Reviewed-on: https://code.wireshark.org/review/5491
+    Bug 10868
+    Change-Id: I496bab62555c7741b3d159726e74a3d14c4b51cb
+    Reviewed-on: https://code.wireshark.org/review/6644
     Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 152b0c9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 19:24:06 2014 -0500
+commit b2b640f
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 18 15:48:22 2015 -0800
 
-    Remove support for pinfo->private_data in "data-text-lines", "data-l1-events" and "urlencoded-form" dissectors.  Data must be passed from parent through dissectors data parameter.
+    Reflect the disappearance of the seasonal allocator.
     
-    Change-Id: I24ab56ce7d99f8ed670f4a50453223d4e6a46983
-    Reviewed-on: https://code.wireshark.org/review/5463
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I1c76bf9eed516aa9afbc04b1b9236a04b0b1988c
+    Reviewed-on: https://code.wireshark.org/review/6643
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e3a04bb
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 20:47:59 2014 -0500
+commit 4cea624
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 18 15:46:23 2015 -0800
 
-    Ensure dissector data parameter is used instead of pinfo->private_data when passing data between dissectors using the "media_type" subdissector.
+    This currently requires emem.h.
     
-    Change-Id: I82cbfed770b41404bc42cb6a4413db07d04dffdc
-    Reviewed-on: https://code.wireshark.org/review/5462
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I55cca8de9be07fbec4e771c0f6d50075fc75bef8
+    Reviewed-on: https://code.wireshark.org/review/6642
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7f22ce7
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 19:50:11 2014 +0100
+commit ae92cd4
+Author: AndersBroman <a.broman@bredband.net>
+Date:   Sun Jan 18 16:38:35 2015 +0100
 
-    pre-commit tools: Add arg option to specify the commit id to be checked
-    
-    If no commit id specify, it is HEAD
+    [Qt] Run windeployqt for Qt versions greater than 5.2
     
-    Thanks to Michal for the help :-)
-    
-    Change-Id: Ibf579aed47c7574f9a01d868ae0d55bbe789a8a2
-    Reviewed-on: https://code.wireshark.org/review/5474
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I3c7e7ed35ffead280c1ac394a4ef8172a89fe3a6
+    Reviewed-on: https://code.wireshark.org/review/6622
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b01ff09
-Author: Enrico Jorns <ejo@pengutronix.de>
-Date:   Tue Nov 25 10:08:05 2014 +0100
+commit 5970223
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 18 14:16:55 2015 -0800
 
-    canopen: Fixed tree expansion
+    Put back ep_alloc0(), accidentally deleted in the removal of the se_ stuff.
     
-    Previously the COB-ID and Type subtree also used the main ett_canopen
-    variable. This made control of subtree expansion impossible as both
-    parent and subtree nodes shared the same state.
+    (The se_ stuff wasn't as contiguous as I thought.)
     
-    Change-Id: I3dabf7f399e83bfcfbf78bc0e633e3696776c043
-    Reviewed-on: https://code.wireshark.org/review/5480
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Also fix some comments to no longer refer to #defines for se_ stuff.
+    
+    Change-Id: Ibc53e6f0f135bee9795f98550d5242e8e58afb16
+    Reviewed-on: https://code.wireshark.org/review/6641
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit c39776c
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Nov 24 12:01:46 2014 -0700
+commit 820c795
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 18 13:30:21 2015 -0800
 
-    Remove unused ui_simple_dialog.h from qt Makefile.common
+    This file currently does need emem.h.
     
-    Change-Id: I366a52a037462cb059565365ea1eec5be228078f
-    Reviewed-on: https://code.wireshark.org/review/5475
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I27e709470d92d4be32ae42a3f4672f2070eaf65e
+    Reviewed-on: https://code.wireshark.org/review/6639
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a600ef6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 18:17:20 2014 -0500
+commit 7940bbc
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 18 13:26:12 2015 -0800
 
-    Have media dissector take its "media type parameter" from dissector data parameter instead of pinfo->private_data.
+    Nobody uses se_ allocations, so remove the code for them.
     
-    Change-Id: I0a0cb0b4838bc4e55a759fb6031355892c220c8e
-    Reviewed-on: https://code.wireshark.org/review/5461
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Don't check for se_ routines in checkAPIs; the failure to compile or
+    link will suffice to catch attempts to use them.
+    
+    Update comments in another test script to reflect the disappearance of
+    the session allocator.
+    
+    Change-Id: If50d953c7130f48b696bc2dd9d327bea2af49bd4
+    Reviewed-on: https://code.wireshark.org/review/6638
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 518bb10
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Nov 24 10:26:00 2014 -0500
+commit d2d4cf2
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 18 13:10:18 2015 -0800
 
-    Remove use of pinfo->private_data since it's not used anywhere.
+    Remove a couple more apparently-no-longer-necessary emem.h includes.
     
-    Change-Id: Ibb47fd1a0d498cc9791ca31ee625395905a7e999
-    Reviewed-on: https://code.wireshark.org/review/5464
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I007a904613653b60a5b1a4fdc8261bc1480e41c6
+    Reviewed-on: https://code.wireshark.org/review/6637
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 392dae5
-Author: Joe Fowler <fowlerja@us.ibm.com>
-Date:   Tue Nov 18 13:13:46 2014 -0500
+commit 050bc7d
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 18 13:02:15 2015 -0800
 
-    Add new dissector for Shared Memory Communications over RDMA protocol (SMC-R)
+    Update some comments to reflect reality.
     
-    RFC draft http://www.ietf.org/id/draft-fox-tcpm-shared-memory-rdma-05.txt
-    used as reference for packet dissection.
+    Get rid of references to ep_ and se_ allocation in code that now uses
+    wmem allocation instead.
     
-    A small change was made to packet-infiniband, to add the Queue Number to the
-    info column.  This allows for easy indentification of session traffic for a
-    particular QP.
+    Fix API documentation of conversation_table.h routines to reflect that
+    as well - some APIs changed to pass wmem scopes.
     
-    Also: infiniband: tvb_length() --> tvb_captured_length()
+    Also, zbee_sec_key_hash() now takes the output buffer as an argument and
+    just returns it, and nobody actually uses the return value, so change it
+    to return void.
     
-    Bug: 10715
-    Change-Id: I774ceffaa5c271cb6a28ab4ed21e53cd42f2547b
-    Reviewed-on: https://code.wireshark.org/review/5386
-    Petri-Dish: Bill Meier <wmeier@newsguy.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Ife1ec675a9322fd0f0be306a9d639ec17aad1c7a
+    Reviewed-on: https://code.wireshark.org/review/6636
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 363b87a
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sat Nov 22 11:59:50 2014 +0100
+commit 929d41c
+Author: Evan Huus <eapache@gmail.com>
+Date:   Sun Jan 18 12:15:26 2015 -0500
 
-    Qt: support the -Y option to set an initial display filter
+    Replace the last THROW ep_ calls with wmem
     
-    Change-Id: I7627265b876c6994b163df1c5b037f4dae2f6d42
-    Reviewed-on: https://code.wireshark.org/review/5445
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-
-commit e899c3e
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 23 23:06:34 2014 -0500
-
-    Eliminate proto_tree_add_text from some dissectors.
+    They (should) all be strictly within the context of dissection, so can just
+    become packet_scope.
     
-    Change-Id: Iadd80aab291e5de714891a9f3c79edeca19e9b93
-    Reviewed-on: https://code.wireshark.org/review/5458
+    Change-Id: Iaaa733628132f3ee3f1597f3df956e44080734f6
+    Reviewed-on: https://code.wireshark.org/review/6631
+    Petri-Dish: Evan Huus <eapache@gmail.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit 4f8a6ec
-Author: Matthieu Coudron <mattator@gmail.com>
-Date:   Tue Nov 18 19:33:53 2014 +0100
+commit 212eb17
+Author: Evan Huus <eapache@gmail.com>
+Date:   Sun Jan 18 12:08:39 2015 -0500
 
-    TCP: fix wrongly set base_seq when ISN is 0 and tcp_relative_seq is
-    enabled
+    replace DISSECTOR_ASSERT ep strings with wmem
     
-    tcp_analysis::base_seq could be set several times when the
-    TCP ISN was set to 0, thus inducing some undesired wraps such as 0-1
+    the DISSECTOR_ASSERT macro and friends are all guaranteed to be called within
+    the scope of a dissection, so they are safe to replace with wmem_packet_scope.
     
-    Bug: 10713
-    Change-Id: I69a0dfe677e93bf51015bf7a39ebf888631b12a4
-    Reviewed-on: https://code.wireshark.org/review/5387
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I2684fb902da78d50aca5f4644df66c060caff625
+    Reviewed-on: https://code.wireshark.org/review/6629
     Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit d5713e2
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 19 21:34:20 2014 +0100
+commit 44e7ce5
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 18 12:18:38 2015 -0800
 
-    hostlist_table (GTK): Fix Dereference of null pointer found by Clang analyzer
+    Remove some apparently-unnecessary includes of emem.h.
     
-    Change-Id: If74dc38b2a9724b9d924092796db5b6beb97043c
-    Reviewed-on: https://code.wireshark.org/review/5400
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80
+    Reviewed-on: https://code.wireshark.org/review/6635
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 159626c
-Author: Maarten Bezemer <maarten.bezemer@gmail.com>
-Date:   Mon Nov 24 16:30:52 2014 +0100
+commit 7abb103
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jan 15 13:07:48 2015 -0800
 
-    Update debian symbols
+    CMake: Copy data files to the run directory.
     
-     * register_tap_ui is removed in a21436eaed
-     * wtap_read_bytes(_or_eof) are introduced in 670ebda4a6
+    Set DATAFILE_DIR to a value that includes the build configuration. Add a
+    copy_data_files target that copies AUTHORS-SHORT, the default filters,
+    and other support files to the run directory. Add FindPowerShell.cmake
+    and require it on Windows. Remove some OS X BUNDLE_RESOURCE_
+    declarations which are now covered by copy_data_files.
     
-    Change-Id: If815c686d57310f0d87f965b5b5c2a71b651cbad
-    Reviewed-on: https://code.wireshark.org/review/5465
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4
+    Reviewed-on: https://code.wireshark.org/review/6561
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 059c257
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Nov 24 16:50:10 2014 -0700
+commit 24954d6
+Author: Bill Meier <wmeier@newsguy.com>
+Date:   Sun Jan 18 14:45:30 2015 -0500
 
-    Allow html version of man pages to be found when running from build
-    directory (they're in doc/ of the build directory).
+    proto.c: Update some comments to reflect reality
     
-    Change-Id: I425fa847952cf9f74a948a89c0048077dfcf0ae2
-    Reviewed-on: https://code.wireshark.org/review/5478
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: I0f82666cb233688d94d6f3a2c45d7490a7f79bec
+    Reviewed-on: https://code.wireshark.org/review/6634
+    Reviewed-by: Bill Meier <wmeier@newsguy.com>
 
-commit 1cdf644
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Nov 21 11:24:50 2014 +0100
+commit e601e01
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 18 11:46:28 2015 -0800
 
-    A21: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
+    Remove some apparently-unnecessary includes of emem.h.
     
-    Second try... ;-)
+    Also update a comment to no longer speak of ep_ allocation, and add an
+    include of <glib.h> to ui/profile.c, which was formerly relying on the
+    include of emem.h to drag it in.
     
-    Remove also double space
-    
-    Change-Id: I77aa269c1abae18b4fb9daec6cc0ac862cf4ab9f
-    Reviewed-on: https://code.wireshark.org/review/5421
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I08926699ee96cf66672836b6ee3bbb405b507ce8
+    Reviewed-on: https://code.wireshark.org/review/6633
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 605a6ae
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 21:12:55 2014 +0100
+commit 233dc64
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 18 11:33:27 2015 -0800
 
-    Mate: Fix indent (use tabs)
+    Remove some apparently-unnecessary includes of emem.h.
     
-    Change-Id: I9a02e4a063dc4fc173ff9b7596acd7f9ceba7aa7
-    Reviewed-on: https://code.wireshark.org/review/5477
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Id50ce3e707056cca8f30052f05c451ce431b39b5
+    Reviewed-on: https://code.wireshark.org/review/6632
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit e02c03b
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Mon Nov 24 12:07:59 2014 -0700
+commit 71c21a6
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jan 16 12:35:14 2015 -0500
 
-    Change capitalization of "DNS UDP [p]orts" to match "DNS TCP ports" in prefs
+    Remove seasonal memory from address resolution.
     
-    Change-Id: Ib0bffc6d5e4bd6b68f48a843b4b4cab7422aceb7
-    Reviewed-on: https://code.wireshark.org/review/5476
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    This is the last remaining use of se_ memory APIs.
+    
+    Change-Id: Ic0508a830bc5460bc743d21eb33ffdd7f4ce2eb5
+    Reviewed-on: https://code.wireshark.org/review/6574
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 4b57edb
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 18:11:30 2014 +0100
+commit 90fc37e
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jan 18 18:08:07 2015 +0100
 
-    MIPv6: Enhance ANI dissection
+    make things a bit easier to read...
     
-    * Fix wrong length for Operator Identifier
-    * Display Latitude and longitude in Degrees
+    Change-Id: I3499c2f9e07a960f8bdf83973693bdeb4fb4ebd9
+    Reviewed-on: https://code.wireshark.org/review/6630
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+
+commit 1722d2a
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jan 18 17:28:16 2015 +0100
+
+    remove trans_info parameter from dissect_usb_hid_report_item()
     
-    Bug:10712
-    Change-Id: Idf6ba63db3ff16710fd0de7a7fd2233148cbaf4a
-    Reviewed-on: https://code.wireshark.org/review/5473
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I04eba644be7dd3e64b67c7d42c596bcdcf6a1942
+    Reviewed-on: https://code.wireshark.org/review/6628
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 15f6f56
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 18:34:19 2014 +0000
+commit 4399319
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jan 18 17:16:15 2015 +0100
 
-    Revert "Allow "(g)make tags" to work again"
+    clean up the functions that dissect the hid requests
     
-    This reverts commit 6b8fe87ef48abb95dd303871d0835c153cf8c891.
+    Change-Id: Ie4d52b62824a8c0c777ffce3988fbe1fd4e5b4a4
+    Reviewed-on: https://code.wireshark.org/review/6627
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+
+commit 9ba910f
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jan 18 17:07:41 2015 +0100
+
+    remove redundant (and unused) paramter usb_trans_info
     
-    Change-Id: Ie4f681186c1555e6ab966e7db687035f7fc5e60f
-    Reviewed-on: https://code.wireshark.org/review/5472
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ibb683f6d42125b13417aceb06949102a9821d626
+    Reviewed-on: https://code.wireshark.org/review/6626
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 6b8fe87
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Thu Nov 20 10:35:45 2014 -0700
+commit 2441a23
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jan 18 08:04:40 2015 -0800
 
-    Allow "(g)make tags" to work again
+    [Automatic manuf, services and enterprise-numbers update for 2015-01-18]
     
-    Change-Id: Idcff82aceedbf42652741564e06ca53984078361
-    Reviewed-on: https://code.wireshark.org/review/5413
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: If1c72e3b58ced6b9b86a584d96f632b2433751e8
+    Reviewed-on: https://code.wireshark.org/review/6623
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 2baac34
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 18:18:00 2014 +0100
+commit 0d92b99
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jan 18 15:20:57 2015 +0100
 
-    CPHA : tvb_length -> tvb_reported_length
+    ISUP: add dissection of generic number qualifier indicator
     
-    Change-Id: I49a7ffb1fcff71d49593ab009036f21c3ae6a2d0
-    Reviewed-on: https://code.wireshark.org/review/5471
+    Bug: 10865
+    Change-Id: Ib4cd60f570250490d5417c692f487711a65536b1
+    Reviewed-on: https://code.wireshark.org/review/6620
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1f5dbb0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 24 17:16:52 2014 +0100
+commit b01ef11
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jan 18 15:35:29 2015 +0100
 
-    CPHA: Update versions lists
+    HTTP: revert a change done in g0ee179c
     
-    Use also value_string ext
+    As indicated in the comment above, the previous code was done on purpose to handle the NUL case
     
-    Request from Hugo van der Kooij
-    
-    Bug:10723
-    Change-Id: I0603687215b7e82a987a4a6cde00eb996b04a77c
-    Reviewed-on: https://code.wireshark.org/review/5466
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Bug: 10866
+    Change-Id: I66eb9f6fbc9477456310978b420ba30975d81b0a
+    Reviewed-on: https://code.wireshark.org/review/6621
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 10803f2
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Nov 21 16:23:24 2014 -0700
+commit 2660806
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jan 18 13:51:00 2015 +0100
 
-    Second attempt at putting a description in the preferences page
+    no need for if(tree)
     
-    Change-Id: I6d196486e824c82d29f1c233ef3230ad8619715d
-    Reviewed-on: https://code.wireshark.org/review/5434
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
+    Change-Id: I7e8cfe3a220d65e80afa109a62867c4ff2ce08e8
+    Reviewed-on: https://code.wireshark.org/review/6619
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 953e6b1
+commit c922801
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 14:13:10 2014 -0500
+Date:   Sat Jan 17 18:30:07 2015 -0500
 
-    Pass data to JSON through dissector data, not pinfo->private_data.
+    ftype (integer): fix Uninitialized argument value found by Clang Analyzer
     
-    Change-Id: I21dc2777822f0836f486432343cc1238886ad29d
-    Reviewed-on: https://code.wireshark.org/review/5460
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I79e893f1d810a90c6a495067941d2e393e9fee72
+    Reviewed-on: https://code.wireshark.org/review/6501
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 0c716f7
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Nov 24 11:38:43 2014 -0500
+commit e7593ea
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jan 18 13:13:00 2015 +0100
 
-    openflow; Fix a (no-effect) typo in openflow_version_values[]
+    asn2wrs: autodetect if 64 bits variant is required for constrained integers
     
-    Change-Id: I7a51face9c675ac3c03f2306ec40293b4835e02e
-    Reviewed-on: https://code.wireshark.org/review/5468
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 7309664
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Nov 24 17:22:02 2014 +0100
-
-    [SIP/DIAMETER] Reinstate the lost dfilter_store_sip_from_addr() and use it
-    for 3GPP AVP 601 Public-Identity.
+    It does not work with defines, but is already a great step forward
     
-    Change-Id: I5ef6608e7821779b00f79486860ee5f578828dfc
-    Reviewed-on: https://code.wireshark.org/review/5467
+    Change-Id: I346d4124690ec46a2299d4eae8031bbb19a3db8e
+    Reviewed-on: https://code.wireshark.org/review/6617
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 78849d0
+commit 12d17d2
 Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 24 15:51:27 2014 +0100
+Date:   Sun Jan 18 13:35:20 2015 +0100
 
-    SMTP: escape ASCII strings printed to COL_INFO
+    Update libwireshark0.symbols
     
-    This is already done automatically for the hf entries thanks to hfinfo_format_text() function
-    
-    Bug: 10536
-    Change-Id: I9ee56b795234a94f0e59c82a96e3e6cedf71c4e6
-    Reviewed-on: https://code.wireshark.org/review/5459
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I694448a998d3a1b74b19d2f1dfd6bb2be5bbce39
+    Reviewed-on: https://code.wireshark.org/review/6616
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit daed807
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 23 00:12:57 2014 -0500
+commit c326fca
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jan 18 12:22:22 2015 +0100
 
-    Pass FrameID as data to the heuristic table, rather than use pinfo->private_data.
+    LDAP: g8c608e6 did not include the changes in template file, that got lost afterwards
     
-    Change-Id: Idd5818cbb2b1f8628bb29c2c71dfc6d41df89b5d
-    Reviewed-on: https://code.wireshark.org/review/5448
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I5d79d3e48c1ad83713a312dce39b749f47b0ecc8
+    Reviewed-on: https://code.wireshark.org/review/6612
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 6dbb97d
-Author: Dave Tapuska <dtapuska@google.com>
-Date:   Mon Nov 17 17:12:36 2014 -0500
+commit 13b1e90
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jan 18 11:58:02 2015 +0100
 
-    SSL: Implement Extended Master Secret
-    
-    Store all handshake mesages in a buffer so that we can hash them
-    correctly when generating the master secret.
-    
-    This change does not work correctly for DTLS retransmitted packets; that
-    are in the handshake as they will be hashed twice; which is bad. Looking
-    for ideas to implement this.
+    ASN.1: regenerate dissectors after g506409d
     
-    Bug: 10686
-    Change-Id: Ied01d4cc37b4270f325070a8d1630d3123577a0d
-    Reviewed-on: https://code.wireshark.org/review/5168
-    Reviewed-by: Peter Wu <peter@lekensteyn.nl>
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: If82112ce7bae4de0c0c24794dc57ffebbf401978
+    Reviewed-on: https://code.wireshark.org/review/6611
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit eb93f3b
+commit ebea11a
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 23 17:03:42 2014 -0800
+Date:   Sun Jan 18 02:46:49 2015 -0800
 
-    Don't do unsafe pointer casting
-    
-    Don't cast a pointer-to-int into a pointer-to-pointer and pass the
-    resulting pointer to g_hash_table_lookup_extended() - pointers and ints
-    are *not* guaranteed to be the same size.  Instead, just have a variable
-    of type gpointer, pass a pointer to *that*, and then run that result
-    through GPOINTER_TO_UINT().
+    We need epan/wmem/wmem.h regardless of whether we have GeoIP.
     
-    This fixes a reproducible crash.
+    It's used to generate the "sorry, we don't have GeoIP" message.
     
-    Change-Id: I42954f222ab59866cb909b80d9dbb1d2668d2aff
-    Reviewed-on: https://code.wireshark.org/review/5457
+    Change-Id: Ibd4e15508d3e2d09d81951b4dc23a1264971bb7a
+    Reviewed-on: https://code.wireshark.org/review/6610
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ec650d4
-Author: Peter Wu <peter@lekensteyn.nl>
-Date:   Sun Nov 23 23:58:24 2014 +0100
-
-    elf: separate ett for program and sections entries
-    
-    This makes it easier to focus on a single section entry, collapsing all
-    other entries.
-    
-    Change-Id: I3de72065eb279e9449496a7224508e5be85c3757
-    Reviewed-on: https://code.wireshark.org/review/5456
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit 4d55e1f
+commit c7500dd
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 23 12:30:59 2014 -0800
+Date:   Sun Jan 18 02:43:54 2015 -0800
 
-    Presumably the intent is to dump *non*-dummy entries.
+    Fix another dfilter_compile() call.
     
-    I.e., presumably the intent is to dump *resolved* hosts, rather than
-    *unresolved* hosts where there's no known host name and the name field
-    is a string form of the address (the premise being that looking the
-    address up in the hash table repeatedly, and using the already-generated
-    string, will be faster than generating the string repeatedly).
-    
-    Change-Id: Iad1beb1d5f9cd9ed92bad5386111cb659614ee4d
-    Reviewed-on: https://code.wireshark.org/review/5455
+    Change-Id: I8b035a09b1bc1981a78a80e0a2547dce65a2ac9c
+    Reviewed-on: https://code.wireshark.org/review/6609
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit da5487f
+commit cfcbb28
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 23 00:20:10 2014 -0800
+Date:   Sun Jan 18 02:22:19 2015 -0800
 
-    Newlines at the ends of lines, please.
+    Clean up ftype-conversion and dfilter error message string handling.
+    
+    Have dfilter_compile() take an additional gchar ** argument, pointing to
+    a gchar * item that, on error, gets set to point to a g_malloc()ed error
+    string.  That removes one bit of global state from the display filter
+    parser, and doesn't impose a fixed limit on the error message strings.
+    
+    Have fvalue_from_string() and fvalue_from_unparsed() take a gchar **
+    argument, pointer to a gchar * item, rather than an error-reporting
+    function, and set the gchar * item to point to a g_malloc()ed error
+    string on an error.
+    
+    Allow either gchar ** argument to be null; if the argument is null, no
+    error message is allocated or provided.
     
-    Change-Id: I7b484e3ddac7cb1330c966819514a9468ea69066
-    Reviewed-on: https://code.wireshark.org/review/5454
+    Change-Id: Ibd36b8aaa9bf4234aa6efa1e7fb95f7037493b4c
+    Reviewed-on: https://code.wireshark.org/review/6608
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit b2030ca
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 23 08:04:42 2014 -0800
+commit c60fb30
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sun Jan 18 10:23:10 2015 +0100
 
-    [Automatic manuf, services and enterprise-numbers update for 2014-11-23]
+    Try to make Mac OS X Buildbots happy
     
-    Change-Id: I6f8a66b742571dcde011125df9295daedc5652a7
-    Reviewed-on: https://code.wireshark.org/review/5450
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    fix return makes pointer from integer without a cast
+    
+    Change-Id: Iaa55de58c36b1a59b08946836e519fee7bb889fc
+    Reviewed-on: https://code.wireshark.org/review/6607
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit e50095c
+commit a1f2342
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 23:11:32 2014 -0500
+Date:   Sat Jan 17 21:17:24 2015 -0500
 
-    Remove use of pinfo->private_data (which doesn't appear to be used anyway) and pass it as dissector data.
-    
-    Some other minor cleanup while in the neighborhood.
+    Miscellaneous ep_strdup_printf replacement.
     
-    Change-Id: I1b0c0567488fa350c14d21c5f5e4cb9746177af1
-    Reviewed-on: https://code.wireshark.org/review/5447
+    Change-Id: I973c672e9d573ad67e9b9fd82a5610aaf8a74efa
+    Reviewed-on: https://code.wireshark.org/review/6605
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e908804
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 22 12:20:05 2014 -0800
+commit ef7e8aa
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jan 17 20:59:20 2015 -0500
 
-    Update symbol list.
+    Remove ep_strndup
     
-    Change-Id: Ib1cb41f212bbccd4e20d3621110cbb98c01a7196
-    Reviewed-on: https://code.wireshark.org/review/5444
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Id336dc16f97a0973754993094aa637813c0ca31c
+    Reviewed-on: https://code.wireshark.org/review/6604
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 08cf40e
+commit 403be72
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 22 13:13:22 2014 -0500
+Date:   Sat Jan 17 20:34:35 2015 -0500
 
-    Use dissector data to "return" XML data to XMPP dissector.
+    Remove emem from GeoIP
     
-    Change-Id: I9abdc8c3deed35131af1537733d624d5cfced182
-    Reviewed-on: https://code.wireshark.org/review/5443
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ifa96dc38a277b86c28f762489251dcc595afae67
+    Reviewed-on: https://code.wireshark.org/review/6603
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 534b596
+commit 86726f4
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 16 10:22:34 2014 -0500
+Date:   Fri Jan 16 23:11:49 2015 -0500
 
-    Cleanup packet-sccp.c in preparation of trying to remove sccp_info member of packet_info.
-    
-    Convert a handful of global variables into function parameters that get passed through the dissector, so we shouldn't be dependent on pinfo->sccp_info anymore. Removal of pinfo->sccp_info will be done in a separate patch (when the dissectors that use it can be updated).
+    Trim down the use of ep_ memory in the display filter code.
     
-    packet-sua.c may need similar treatment.
+    Couldn't quite eliminate it completely, but it's much improved.  Need to figure out where/when to free dfilter_error_msg.
     
-    Change-Id: If0001638d666afc07e04b02aa32ef31d6223a5de
-    Reviewed-on: https://code.wireshark.org/review/5343
+    Change-Id: I10216e9546d38e83f69991ded8ec0b3fc8472035
+    Reviewed-on: https://code.wireshark.org/review/6591
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 0ad15f8
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jan 17 16:55:46 2015 -0500
+
+    Replace the last of ep_alloc and ep_alloc0 with wmem equivalent.
+    
+    Change-Id: I0338d0acda5e4b9957aad4825ca2cfd6fa506ead
+    Reviewed-on: https://code.wireshark.org/review/6596
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e2b597a
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Wed Nov 19 22:22:12 2014 -0500
+commit b5eb971
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jan 17 16:30:25 2015 -0500
 
-    Fix problem where the profile bar moves further left every time Wireshark is
-    run.
+    Replace all remaining instances of ep_new with wmem_new and wmem_packet_scope.
     
-    For the saved/restored geometry to be consistently correct we need to always
-    show the expert info and capture file comment icons.  Disable them if no
-    capture file is open.
-    
-    Bug: 10518
-    Change-Id: I6e254f66a17f8f54f28cfbafb4e0f92e02cff70c
-    Reviewed-on: https://code.wireshark.org/review/5404
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I50b2cd0e233554bc58082e96e8d879b40edfc0c1
+    Reviewed-on: https://code.wireshark.org/review/6595
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit c61a037
-Author: Jesse Gross <jesse@nicira.com>
-Date:   Tue Nov 18 14:36:30 2014 -0800
+commit be113e8
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 12 20:04:32 2015 +0100
 
-    Add version check in Geneve dissector.
+    DHCP/BOOTP: Option 125 Suboption: (1) option-len always expects 1 but specification allows for more
     
-    We should warn when decoding Geneve packets with an unknown
-    version number.
+    We believe this is a bug in Wireshark with Option 125 Suboption: (1)  option-len where Wireshark always expects 1 but specification is more flexible.
+    Re: http://www.cablelabs.com/wp-content/uploads/specdocs/CL-SP-CANN-DHCP-Reg-I10-1308081.pdf page 15 part 4.2.2 'The DHCPv4 Option Request Option'
     
-    Change-Id: Id40b756c3bb0320b69fbd8ee98830a2b05834a48
-    Reviewed-on: https://code.wireshark.org/review/5420
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-    Petri-Dish: Anders Broman <a.broman58@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Issue reported by Steve Krebs
+    
+    Bug:10784
+    Change-Id: I8eced7a70877d13d925b81c0f47885609baa7633
+    Reviewed-on: https://code.wireshark.org/review/6510
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 01f9706
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Fri Nov 21 23:27:56 2014 +0000
+commit 506409d
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Jan 17 22:43:46 2015 +0100
 
-    Add the required c flags for some test executables
+    X509AF: dissect Certificate Serial Number as INT64 instead of INT32
     
-    Change-Id: I93b0c346fff162899e5f97dd2366e01cf99ec38e
-    Reviewed-on: https://code.wireshark.org/review/5435
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Bug: 10862
+    Change-Id: Ie315298dd090b3b689f6a9bfff6f6f5bf7cc715a
+    Reviewed-on: https://code.wireshark.org/review/6594
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 741db4c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 22 01:07:13 2014 -0800
+commit 77dac91
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jan 16 23:18:46 2015 -0500
 
-    Get rid of another global in the print code.
+    A few more emem replacements with wmem.
     
-    Pass the "output only these protocols" hash table as an argument,
-    instead.
+    Change-Id: Icfb319fba937642db637a7f26b5e7627461df3b0
+    Reviewed-on: https://code.wireshark.org/review/6590
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+
+commit 5c5b3f7
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jan 16 21:47:48 2015 -0500
+
+    Convert proto_construct_match_selected_string to use wmem.
     
-    Change-Id: Id8540943037e7b9bbfe377120c3f60dbe54fe0f1
-    Reviewed-on: https://code.wireshark.org/review/5440
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I7a40c0996517aa71b4ddb764ce3a6e92a55260ad
+    Reviewed-on: https://code.wireshark.org/review/6589
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit c68e77b
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 22 00:28:12 2014 -0800
+commit 6010d99
+Author: Sebastian Kloeppel <sk@nakedape.net>
+Date:   Thu Jan 15 11:19:41 2015 +0100
 
-    Pass a capture_file * to write_psml_preamble() in tfshark as well.
+    Added Card Application Toolkit Transport Protocol (CATTP) dissector
     
-    Change-Id: I2b2ae78d4b75bb27a44d185b48e3d85794effdb7
-    Reviewed-on: https://code.wireshark.org/review/5439
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 10843
+    Change-Id: I35350d98b4225be12875b16e67506f7385ea9f28
+    Reviewed-on: https://code.wireshark.org/review/6111
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit b19b12a
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sat Nov 22 00:06:54 2014 -0800
+commit ffa8bdd
+Author: Russel <russel@appliedinvention.com>
+Date:   Fri Jan 16 14:27:10 2015 -0800
 
-    Get rid of write_headers global variable.
+    Correct PF field offset when looking for DA
     
-    Have write_psml_preamble() and write_csv_preamble() take a capture_file *
-    as an argument, so they can print the column titles themselves, rather
-    than having to defer it to the routine that prints packet data.
+    Previous code was not shifting far enough, was checking PS instead
+    of PF.
     
-    Change-Id: Ifd1b7a13062be8ad46846315976922a752778153
-    Reviewed-on: https://code.wireshark.org/review/5438
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ic0bdbb4dfaa7bdd708a49f1fb67706dd949f2607
+    Reviewed-on: https://code.wireshark.org/review/6578
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 6e1214c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 21 19:32:33 2014 -0800
+commit 8ec6ac6
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sun Jan 11 11:57:42 2015 +0100
 
-    Fix comments.
+    dissect CCRC, APRC and the APDU body's data
     
-    Change-Id: I3b7340939b8204102bfc7e2e7d83f4d978cf7bad
-    Reviewed-on: https://code.wireshark.org/review/5437
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I21f7420286ed3e668ce4dc0eac06bbf4172039d6
+    Reviewed-on: https://code.wireshark.org/review/6588
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 7d7fc47
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 21 19:22:54 2014 -0800
+commit 21e40ea
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Sat Jan 10 18:33:32 2015 +0100
 
-    Split the low-level print stream code into a separate file.
-    
-    Put the low-level print stream code from epan/print.c into
-    epan/print_stream.c, leaving the higher-level stuff in print.c
+    dissect the serial characters and the CRC
     
-    Change-Id: Iae961f168ec655a29f434257b1af0937fca9f025
-    Reviewed-on: https://code.wireshark.org/review/5436
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I64af822f30b02d313f5242014ff5e40a73dffa35
+    Reviewed-on: https://code.wireshark.org/review/6587
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit 08475ff
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 19 13:52:52 2014 -0500
+commit a38b714
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Jan 17 14:55:22 2015 +0100
 
-    README.heuristic: rework example code.
+    RSYNC: Malformed Packet on rsync-version with length 2
     
-    Specifically: show the use of tcp_dissect_pdus()
-       for a TCP heuristic dissector
+    RSYNC dissector always think the resync-version length = 4
     
-    Change-Id: I02f184b2c8ef6ed128ef3d0bc59eed759aae54bb
-    Reviewed-on: https://code.wireshark.org/review/5399
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Bug:10863
+    Change-Id: I2dee3ff7195af110223903d79b938849666878a7
+    Reviewed-on: https://code.wireshark.org/review/6584
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit fecea97
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 19 21:34:50 2014 +0100
+commit aa1057d
+Author: maisheri <maisheri.hitesh@gmail.com>
+Date:   Sat Jan 17 14:05:38 2015 +0530
 
-    VoIP Call (GTK): Fix Dereference of null pointer found by Clang analyzer
+    EAPOL-MKA: Included fixes for the distributed sak handling.
     
-    Change-Id: I80029b6238c78dcab83a6a70eca0af5b66e1488d
-    Reviewed-on: https://code.wireshark.org/review/5401
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Id91ba408266f18a9336811bf9d8b875796ea0cc1
+    Reviewed-on: https://code.wireshark.org/review/6582
+    Reviewed-by: maisheri <maisheri.hitesh@gmail.com>
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit c07e9fe
-Author: Irene Ruengeler <ruengeler@wireshark.org>
-Date:   Mon Nov 17 08:51:12 2014 +0100
+commit 62ea319
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jan 16 18:59:12 2015 -0800
 
-    Add minimize and maximize buttons to the SCTP analysis windows.
+    PacketLogger files can be big-endian or little-endian.
     
-    As suggested by Jeff Morriss.
+    Bug: 10861
+    Change-Id: Iedb248aa4a96e65bb525ba6475dc767e5dfefbe0
+    Reviewed-on: https://code.wireshark.org/review/6579
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 3f284fb
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jan 15 22:41:13 2015 +0100
+
+    USB: do not put usb_address_t structure on stack and initialize it completely (including implicit padding for alignment)
     
-    Change-Id: Ibe2d30c31d51ab92377d64068527b424a92e8a64
-    Reviewed-on: https://code.wireshark.org/review/5361
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Bug: 10857
+    Change-Id: Ib8339a5dc1c9461e681e0015c3f851c642f300c9
+    Reviewed-on: https://code.wireshark.org/review/6560
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit d7e277a
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 21 10:43:40 2014 -0500
+commit 1e8c6ee
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jan 16 22:28:13 2015 +0100
 
-    CANopen bugfixes
-    
-    1. Fixed endianess in CANopen dissector.
-    According to CiA 301, 7.1.1. (p. 26):
-    "For numerical data types the encoding is little endian style."
-    
-    2. Fixed NMT type string in CANopen dissector
-    NMT function code should not display 'EMERGENCY'
-    
-    3. Fixed time stamp decoding
+    Update a comment
     
-    * Offset increment was too low for data type size
-    * Decoding of time_stamp_days must equal time_stamp_msec and thus be letohs instead of ntohs. CANopen data is little-endian encoded.
+    Change-Id: I7bf1173bfb23e5f083b8aaf09476b30b4791aae0
+    Reviewed-on: https://code.wireshark.org/review/6577
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit fa54781
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jan 16 11:26:20 2015 -0800
+
+    Update comment to reflect the current reality.
     
-    4. Fix: Use correct description string for NMT error control state bits
-    canopen.nmt_guard.state was faulty named "Node-ID". This was changed to "State".
+    Change-Id: I7f8c66723efc9d21ec3abc08e57db1df5f772f04
+    Reviewed-on: https://code.wireshark.org/review/6576
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit 23666ba
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Fri Jan 16 10:40:26 2015 -0800
+
+    Spaces separate bytes; they don't have to surround them.
     
-    5. Fix nmt_guard_state value_string array
-    CiA 301 desribes only 4 valid values. All other were deleted.
-    0x00 was renamed from 'Initalisation' to 'Boot-up' following CiA301.
+    I.e., you don't need a trailing blank, at least not with the current
+    version (and there shouldn't be a requirement for such an extra trailing
+    blank).
     
-    6. Shortened EMERGENCY to EMCY
+    Change-Id: Ia2b732c74fc6020acc01a2c0c52ed3567d36d762
+    Reviewed-on: https://code.wireshark.org/review/6575
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+
+commit b6ec25f
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jan 16 18:05:15 2015 +0100
+
+    IS-IS: Add missing i variable for subclv loop (IS Reachability)
     
-    The term EMCY is the standard abbreviation used in CiA standard for Emergency service.
+    Issue found by Alexander Okonnikov
     
-    7. Fix: Allow SYNC and NMT error frames without any payload
-    NMT node guard remote requests do note have a payload,
-    SYNC frames only have an optional payload (counter)
+    Change-Id: I4eacab63a685b84c0d75811b96dc452471244337
+    Reviewed-on: https://code.wireshark.org/review/6573
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+
+commit 22543d3
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jan 16 18:03:03 2015 +0100
+
+    IS-IS: wrong length for SubTLV 18 (TE default Metric)
     
-    If item length is set to -1, decode will cause a 'Malformed Packet' error.
+    Issue found by Alexander Okonnikov
     
-    8.  Rename MT_NMT_GUARD to MT_NMT_ERR_CTRL which better reflects its scope
+    Change-Id: I8c1da71183f5bba50bb0bb541c259d5dba0b067d
+    Reviewed-on: https://code.wireshark.org/review/6572
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+
+commit 3f57512
+Author: Evan Huus <eapache@gmail.com>
+Date:   Fri Jan 16 11:09:51 2015 -0500
+
+    Kill more unused emem functions
     
-    Change-Id: I676f9b5f2e4efd8e7c9528fe289e7510c4d43235
-    Reviewed-on: https://code.wireshark.org/review/5425
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ib81410b6d760886f2ae585f44ac58fc135da62c7
+    Reviewed-on: https://code.wireshark.org/review/6568
+    Petri-Dish: Evan Huus <eapache@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit f2fc562
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 21 15:54:59 2014 +0100
+commit 4fa7396
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jan 15 12:45:02 2015 +0100
 
-    Replace tvb_length()
+    CMakeList.txt/Makefile.am (root) : fix indent (use tabs)
     
-    Change-Id: I0b5ad4d588f0b658abaf3892d08d6520ecd2f645
-    Reviewed-on: https://code.wireshark.org/review/5431
+    Makefile.am: avoid double space
+    CMakeList.txt: Add modelines info
+    
+    Change-Id: Ic27d16b2f502362509ab13158e5428208afe3925
+    Reviewed-on: https://code.wireshark.org/review/6570
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 96fb347
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Nov 20 19:35:25 2014 -0500
+commit 16d367f
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Jan 16 17:09:51 2015 +0100
 
-    Remove some leftover debug printfs.
+    ZBee ZCL: use tvb_get_guint8() (avoid tvb_get_ptr... !)
     
-    Change-Id: I9f4c7f71ae403059a2a236ba095b21753f7938fa
-    Reviewed-on: https://code.wireshark.org/review/5417
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I248ddb1dee5398528279807968b095cbc5413ae0
+    Reviewed-on: https://code.wireshark.org/review/6569
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 1cde318
-Author: Michał Orynicz <michal.orynicz@tieto.com>
-Date:   Thu Nov 20 13:16:33 2014 +0100
+commit 531df02
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jan 16 08:15:41 2015 -0500
 
-    Fix for very big pid and tid numbers in logcat_text
+    Remove se_ alloced memory from packet_list_store
     
-    There can be no space after pid colon if tid is big enough
-    in logcat long format.
-    
-    Change-Id: I8e03e78c88e4bef1a5fdb3a04b77f58fa7d055bc
-    Reviewed-on: https://code.wireshark.org/review/5411
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I7aa2f5f8b433468ad2c2cd73cfce986d128a9ae0
+    Reviewed-on: https://code.wireshark.org/review/6565
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 1d8673c
-Author: Michał Orynicz <michal.orynicz@tieto.com>
-Date:   Thu Nov 20 13:09:31 2014 +0100
+commit 0235775
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Fri Jan 16 14:59:54 2015 +0100
 
-    Move text logcat regex strings to shared header
-    
-    To avoid further duplication of work and bugfixing,
-    move regex strings to wiretap/logcat_text.h and include
-    this file in epan/dissectors/packet-logcat-text.c
+    GSM SIM: enhance dissection of APDU Class byte
     
-    Change-Id: I82773cda0e3240844139b104c68738ec82788014
-    Reviewed-on: https://code.wireshark.org/review/5410
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I2089ff665a92ce16a0af100e2515463c92c6d057
+    Reviewed-on: https://code.wireshark.org/review/6567
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 1b9dd75
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Thu Nov 20 20:30:32 2014 -0500
+commit ada1eec
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jan 11 21:32:53 2015 -0500
 
-    Fix the build: dissect_a21_ie_common() can't be static any more.
+    SE_COPY_ADDRESS -> WMEM_COPY_ADDRESS
     
-    Change-Id: I93db6bc35aef9c36a294e530730cd295ad6851ef
-    Reviewed-on: https://code.wireshark.org/review/5419
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Copy addresses with wmem-scope instead of (forced) seasonal scope.  All existing instances were converted to wmem_file_scope, but the flexibility is there for other scopes.
+    
+    Change-Id: I8e58837b9ef574ec7dd87e278470d7063ae8c1c2
+    Reviewed-on: https://code.wireshark.org/review/6564
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 1df0d9c
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 20 16:57:24 2014 -0800
+commit 260b19e
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jan 16 08:29:57 2015 -0500
 
-    Include "ws_symbol_export.h" to make sure WS_DLL_PUBLIC is defined.
+    Remove seasonal memory from everything except address resolutions
     
-    Wrap the declaration for C++ while we're at it.
+    This includes circuits, conversations and streams as well as camel and h225 dissectors.
     
-    Change-Id: Ifcc1b47bab139f5fb8da8c3dd4f20b1ebb99739e
-    Reviewed-on: https://code.wireshark.org/review/5418
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ia5ee70a5e5c6bcb420f0f19df126595246a3c042
+    Reviewed-on: https://code.wireshark.org/review/6566
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9732398
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Nov 20 20:04:42 2014 +0100
+commit b2c4586
+Author: Chris Brandson <chris.brandson@gmail.com>
+Date:   Thu Jan 15 19:20:08 2015 -0800
 
-    A21: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
+    bug 10833 undecoded bitmaps were being displayed raw which is hard to interpret, changed to an more friendly format
     
-    Change-Id: Ib2f3816892f1682c175b0dee3c80725caebf3d4d
-    Reviewed-on: https://code.wireshark.org/review/5415
+    Change-Id: If79a695646837cdfb3e1b168a47b96984c58e328
+    Reviewed-on: https://code.wireshark.org/review/6563
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5e932ad
+commit a4d1709
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Thu Jan 15 21:46:52 2015 -0500
+
+    (Trivial) Move a comment next to the code related to it.
+    
+    Change-Id: I83749a1b30059cc8e8f13b58fbde74e9ab873582
+    Reviewed-on: https://code.wireshark.org/review/6562
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+
+commit d009b55
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Nov 20 20:04:26 2014 +0100
+Date:   Thu Jan 15 19:48:39 2015 +0100
 
-    EPL: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
+    Quakeworld: Nesting level does not match indendation (CID 1159218)
     
-    Change-Id: I40de0c8c2bd40f18a33947367fdeec5a22a3093a
-    Reviewed-on: https://code.wireshark.org/review/5414
+    Change-Id: I6d18f103bda6db025eebfc902453256b007dddf7
+    Reviewed-on: https://code.wireshark.org/review/6556
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e77261f
+commit 3f8fbb7
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Mon Nov 17 20:04:30 2014 -0500
+Date:   Sun Jan 11 21:18:22 2015 -0500
 
-    Eliminate proto_tree_add_text from some dissectors.
+    Remove the last two true calls to se_alloc.
     
-    Change-Id: Ib160211198ca02f7eacf29d04568628c11f208a5
-    Reviewed-on: https://code.wireshark.org/review/5407
+    (The other calls are just wrapped in macros)
+    
+    Change-Id: I6a029dddf7742ba95510ec24cec30553461e48c6
+    Reviewed-on: https://code.wireshark.org/review/6558
     Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 9611e75
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Thu Nov 20 16:07:55 2014 +0100
+commit e530c89
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jan 11 19:48:54 2015 -0500
 
-    Replace tvb_length...() calls.
+    Replace se alloced memory in compare stat tap.
     
-    Change-Id: Idda7cd56a12b36d18774a1fe324c69eb8f5e4330
-    Reviewed-on: https://code.wireshark.org/review/5412
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Also replaced comments mentioning se_alloc memory with wmem_file_scope, since it's more accurate.
+    
+    It seems that many of the TShark stat taps may be leaking memory, because the hash tables created by the taps don't get a chance to be freed.  Somewhat academic since TShark exits shortly after displaying any stats, but a leak none the less.
+    
+    Change-Id: I8ceecbd00d65b3442dc02d720b39c2e15aa0c8a6
+    Reviewed-on: https://code.wireshark.org/review/6557
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 9145acb
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 18 22:53:32 2014 -0500
+commit 7d43836
+Author: Deon van der Westhuysen <deonvdw@gmail.com>
+Date:   Tue Jan 6 10:22:48 2015 +0100
 
-    uat: tighten up dec/hex uat field validity checking
+    QT: stats_tree plug-ins not added to statistics menu
     
-    Specifically:
-    - Use the proper code for testing strtol() result;
-    - Also: Values greater than 32-bits treated as an error
-       (on LP64 architectures);
+    Wireshark Qt does not add plug-ins that register with stats_tree_register_plugin() to the statistics menu in the ui (like the gtk version does).
     
-    Change-Id: I56e8e734fbb9a22dbd9ed4112e24327ffd7ee3c0
-    Reviewed-on: https://code.wireshark.org/review/5394
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-    Petri-Dish: Bill Meier <wmeier@newsguy.com>
+    This patch dynamically adds all registered stats_tree plug-ins to the statistics menu.
+    
+    Bug: 9528
+    Change-Id: I99f9415502ca9f7121d494c856861edc1a762079
+    Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-on: https://code.wireshark.org/review/6336
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit ead585f
+commit d5ee022
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 16 15:15:52 2014 -0500
+Date:   Thu Jan 15 15:09:47 2015 -0500
 
-    Give better hints as to where the "expert info" fields go.
+    Replace C++ style comment with C style.
     
-    Change-Id: I9b1cee43ef9280504745b136b87507c2b6bb5369
-    Reviewed-on: https://code.wireshark.org/review/5406
+    Change-Id: Ibee0dccdb5a330866dcd0047216cd5a4da45fc8b
+    Reviewed-on: https://code.wireshark.org/review/6559
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit f7f19f0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Wed Nov 19 20:10:15 2014 +0100
+commit c610c38
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jan 15 19:46:11 2015 +0100
 
-    IrDA: always initialize buffer before accessing it
+    Conversation Table : Copy-paste error (CID 1262415)
     
-    Bug: 10716
-    Change-Id: I8e54f750b70076758d5fd0d7f35f9c782f5d0bf9
-    Reviewed-on: https://code.wireshark.org/review/5398
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I37fd8154f93763ac091528921d1b66d8e8fd56dd
+    Reviewed-on: https://code.wireshark.org/review/6555
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit bcc4c7f
-Author: Balint Reczey <balint@balintreczey.hu>
-Date:   Fri Nov 14 21:39:00 2014 +0100
+commit e75dd98
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jan 15 19:45:10 2015 +0100
 
-    Fix global plugin folder when it is set as an absolute path
+    NetFlow: Assign instead of compare (CID 1262419 & 1262420)
     
-    This fixes regression in creating Debian packages caused by
-    80b36cdbde90ac9639938a14e8fd90a79602666a
+    Change-Id: Idc2c2e02b973f65c6c2f22f2d1bfd8545cd23f63
+    Reviewed-on: https://code.wireshark.org/review/6554
+    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
+
+commit 1562827
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jan 15 19:38:25 2015 +0100
+
+    Packet List (Qt): Missing break in switch (CID 1262418)
     
-    Change-Id: I46702ad4c9a11ce317da7ef664c84e1f22d3f709
-    Reviewed-on: https://code.wireshark.org/review/5316
-    Reviewed-by: Evan Huus <eapache@gmail.com>
-    Petri-Dish: Evan Huus <eapache@gmail.com>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Change-Id: Id46f2be5b5206dfcb0ce7e7ea2d31398eff54917
+    Reviewed-on: https://code.wireshark.org/review/6552
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 6fbcc18
-Author: Michał Orynicz <michal.orynicz@tieto.com>
-Date:   Thu Nov 20 09:55:40 2014 +0100
+commit 3385984
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Thu Jan 15 19:43:11 2015 +0100
 
-    Fix text logcat for changes in android L
+    Address to str: Missing break in switch (CID 1262416 & 1262417)
     
-    In L, in line "-- beginning of /<buffer>" the "/" was removed.
-    This commit accomodates text logcat to that change.
+    It will also fix "Unused Value" (CID 1262422)
     
-    Change-Id: I4cbfadf5a8169589f2848ce1a5793cea593ba459
-    Reviewed-on: https://code.wireshark.org/review/5405
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I626c087365e9d6fe625f807ab8ded518d94cab64
+    Reviewed-on: https://code.wireshark.org/review/6553
+    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit 087518b
+commit adf0881
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 19 19:18:39 2014 +0100
+Date:   Thu Jan 15 19:26:52 2015 +0100
 
-    MIP6: Access network identifier option is not full decoded
+    HTTP: fix implicit conversion shortens 64-bit value into a 32-bit value
     
-    * Add subtype Geo Location (2) and Operator Identifier (3)
-    * Use also offset to calculate the length
-    * Remove proto_tree_add_text
+    It will be make Mac OS X buildbot happy
     
-    Issue reported by Ravindranath K M
-    
-    Bug:10712
-    Change-Id: I9ad81ece856df134f3a706ad774d34e638cb5c94
-    Reviewed-on: https://code.wireshark.org/review/5397
+    Change-Id: I628445c1358675a58cc2d26ce1ca3007dd619ff3
+    Reviewed-on: https://code.wireshark.org/review/6551
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit d23247e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 19 16:53:36 2014 -0800
+commit 9c044e2
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jan 15 14:25:24 2015 +0100
 
-    White space tweaking to match what's in Samba git.
-    
-    (Samba git also needs some white space tweaking; this only changes the
-    cases where we're not obviously "better".)
+    ZigBee: packet scope memory cannot be used for BASE_CUSTOM callbacks
     
-    Change-Id: Iafb9cf8fea67b898b12850a7793806e3fccb39ac
-    Reviewed-on: https://code.wireshark.org/review/5403
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I28fe21151b9f8c91786ca6c56d141a458419c501
+    Reviewed-on: https://code.wireshark.org/review/6548
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 4fdabdc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 19 21:35:14 2014 +0100
+commit 69d32a9
+Author: Uli Heilmeier <uh@heilmeier.eu>
+Date:   Mon Jan 12 16:26:39 2015 +0100
 
-    SBC: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    HTTP Dissector: Add CitrixAGBasic authentication
+    
+    Citrix uses a proprietary authentication schema called CitrixAGBasic for
+    their StoreFront/Web Interface product.
     
-    Change-Id: I6ac8e0eed88e78521f7d5623b9afdb6a42900ede
-    Reviewed-on: https://code.wireshark.org/review/5402
+    The Header looks like:
+    Authorization: CitrixAGBasic username="dGVzdHVzZXI="; domain= \
+           "dGVzdGRvbWFpbg=="; password="c2VjcmV0"; AGESessionId= \
+           "YzI0NmRkMmFmYmE5ZTk5M2I5ZDRkN2UwYzYzZWExN2U="
+    
+    This patch enhances the HTTP dissector to decode this authentication data.
+    
+    Due to non-discolsure I can only provide a faked GET request as a pcap
+    capture (attached to this bug).
+    
+    Bug: 10851
+    Change-Id: Ic8e48db94809c9c64889cd050911de3fe23cdcdd
+    Reviewed-on: https://code.wireshark.org/review/6526
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 06dc2a7
+commit e0539ed
 Author: Gerald Combs <gerald@wireshark.org>
-Date:   Wed Nov 19 09:03:44 2014 -0800
+Date:   Thu Jan 15 08:34:52 2015 -0800
 
-    voip_calls: Fix tap callbacks.
-    
-    We don't need to call the VoIP tap reset and draw callbacks repeately.
-    Do so only once from the RTP tap. Packet callbacks should return a
-    gboolean.
+    CMake: Rename the windeployqt variable.
     
-    Clean up some function names and make some static.
+    The windeployqt variable name ends up in the cache. Change it to
+    QT_WINDEPLOYQT_EXECUTABLE, which follows conventions used in the Qt
+    CMake modules.
     
-    Change-Id: I5c934ce8ce7f279861e8cc73235bbfc27d7fe622
-    Reviewed-on: https://code.wireshark.org/review/5396
+    Change-Id: I14998b921009e44e5ca743e2915fe84447b22df0
+    Reviewed-on: https://code.wireshark.org/review/6549
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit cb090e8
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 19 11:25:17 2014 -0500
+commit 58bb07b
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Wed Jan 14 22:59:21 2015 +0000
 
-    [pedantic] Replace usage of 'long' and 'long long'
+    Fix-copy-qt-dll
     
-    Change-Id: I78fc82c1a83eb04d78a11fc76710c92dfc916208
-    Reviewed-on: https://code.wireshark.org/review/5395
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    The copy-qt-dll custom command should ensure the qt bin dir is on
+    the path.
+    Modify the flags passed to windeployqt depending on the configuration.
+    
+    Change-Id: I12860d415f80cee323c72aa8a4892eaa6126f165
+    Reviewed-on: https://code.wireshark.org/review/6537
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 67ab27a
-Author: Michael Tüxen <tuexen@wireshark.org>
-Date:   Wed Nov 19 15:57:48 2014 +0100
+commit a1fce22
+Author: Martin Kaiser <martin.kaiser@paytec.ch>
+Date:   Thu Jan 15 16:18:23 2015 +0100
 
-    Add support for PAD chunks.
+    remove the executable bits from packet-zvt.c
     
-    Add support for PAD chunks as defined in RFC 4820.
+    (I should not use git on cygwin for adding new files)
     
-    Change-Id: I66a83d5d133429154fe40ccef26687c8350463cf
-    Reviewed-on: https://code.wireshark.org/review/5393
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
+    Change-Id: I314d78073f1ebd633a20ff7c9ac3d0b236b3906a
+    Reviewed-on: https://code.wireshark.org/review/6547
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit d7179ac
-Author: Michael Tüxen <tuexen@wireshark.org>
-Date:   Wed Nov 19 15:35:36 2014 +0100
+commit ba7aa19
+Author: Martin Kaiser <wireshark@kaiser.cx>
+Date:   Wed Dec 24 12:42:16 2014 +0100
 
-    Fix the length reported as value length.
+    start a dissector for ZVT Kassenschnittstelle
     
-    The length reported as value length for unknown chunks
-    was actually the chunk length. Therefore it was off by 4.
+    this is a protocol between payment terminals and
+    electronic cash-register systems / vending machines
     
-    Change-Id: Ieea79d2c51b4729fc139395174625d1f362d1ee5
-    Reviewed-on: https://code.wireshark.org/review/5392
-    Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
+    Change-Id: Ieac87c0af8e15f2dfe8b4a6274f3b56d652a5b1f
+    Reviewed-on: https://code.wireshark.org/review/6531
+    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
+    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
 
-commit c62dac1
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 16 13:10:37 2014 -0500
+commit 1e1d96f
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Thu Jan 15 16:01:40 2015 +0100
 
-    Eliminate proto_tree_add_text from packet-mate.c
+    Modify the errorcode defenition to suit ANSI MAP, this is (probably) OK as
+    ANSI MAP is currently the only user of ANSI TCAP.
+    Bug: 6112
     
-    Change-Id: I3f4b3eb23b91b219df373b3012fbefa63abfa4d3
-    Reviewed-on: https://code.wireshark.org/review/5350
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I49f89c862ddc8351091a9a939415e4ba6e7603f5
+    Reviewed-on: https://code.wireshark.org/review/6546
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 61b0638
-Author: Graham Bloice <graham.bloice@trihedral.com>
-Date:   Tue Nov 18 15:59:44 2014 +0000
+commit ef0435b
+Author: Evan Huus <eapache@gmail.com>
+Date:   Thu Jan 15 08:31:26 2015 -0500
 
-    Remove Windows linker flags from the CMake link flags test as the
-    test doesn't actually pass the flags to the VS linker.
+    ZigBee: don't use packet_scope outside of dissection
     
-    Change-Id: I5d546afcb80a49e39143078bc8f0855b0ba0f7e8
-    Reviewed-on: https://code.wireshark.org/review/5384
-    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
-
-commit 39b0c2d
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Oct 16 13:58:58 2014 +0200
-
-    Wiretap: Added file_seek SEEK_END support.
+    The decode_* functions defined here are called post-dissection for formatting
+    labels, so don't have access to packet scope. Just use and free manual memory.
     
-    This is needed for Lua File:seek("end").
+    Introduced in gbdfabe59.
     
-    Change-Id: I28fb23f2f29ca8083c77bf065db8816e039ae5a1
-    Reviewed-on: https://code.wireshark.org/review/4722
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Bug: 10855
+    Change-Id: I9b0085b1f7779ae6fbd12482c44d8f611cdbb49f
+    Reviewed-on: https://code.wireshark.org/review/6545
+    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit cfa0e5f
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Tue Nov 18 13:13:35 2014 -0800
+commit c2350a5
+Author: Evan Huus <eapache@gmail.com>
+Date:   Thu Jan 15 05:42:06 2015 -0500
 
-    voip_calls: Regression fixes.
+    rsvp: fix typo
     
-    Fix struct initialization logic. Clear a GQueue instead of deleting it.
-    Don't crash if we have no sequence diagram items. Make sure we show all
-    flows and not just invites. Zero allocated memory in a couple of places.
+    caught by test suite as:
+    Duplicate field detected in call to proto_register_field_array:
+    rsvp.call_attributes is already registered
     
-    Change-Id: Ia5bb3ba57cf625de4b554b354e098aa0361dff28
-    Reviewed-on: https://code.wireshark.org/review/5390
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ibf4ead3026b9930fb8f6ab07f0a5a4c299cedc35
+    Reviewed-on: https://code.wireshark.org/review/6544
+    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit dc5b8f1
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Sun Nov 16 19:09:57 2014 +0200
+commit 0d9248e
+Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
+Date:   Thu Jan 15 09:41:32 2015 +0000
 
-    dissect TA(1)
+    Netflow: Fix spelling of 'latitude'
     
-    Change-Id: If618b0c3dc0502f5a31dcc580b9116daacb40239
-    Reviewed-on: https://code.wireshark.org/review/5389
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    Change-Id: Iaae40f4a191e458645263c8d7a114392cd063707
+    Reviewed-on: https://code.wireshark.org/review/6543
+    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
 
-commit 7cdfe52
-Author: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date:   Tue Nov 18 21:11:22 2014 +0300
+commit adaa661
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Jan 7 21:32:47 2015 +0100
 
-    Update Couchbase dissector:
+    Update to libnghttp2 0.7.1
     
-    * Register new commands:
-        * 0x5c: DCP_NOOP
-        * 0x5d: DCP_BUFFER_ACKNOWLEDGEMENT
-        * 0x5e: DCP_CONTROL
-        * 0x5f: DCP_RESERVED4
-    
-    Change-Id: I22d8eb8f6628e07b2e2ab2bc137688329eead1be
-    Reviewed-on: https://code.wireshark.org/review/5385
+    Change-Id: Ib8d40586a3b95674447819f77eaaa69376dce6fd
+    Reviewed-on: https://code.wireshark.org/review/6411
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit e97d235
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 17 22:49:24 2014 +0100
-
-    SPDY: do not try to access an uninitialized tvb
-    
-    Coming when data length = 0
-    
-    Bug: 10704
-    Change-Id: Ibd0730be661d966aa0429480dba97ed7d3e5c471
-    Reviewed-on: https://code.wireshark.org/review/5377
+commit 5b92ab9
+Author: Miltos Patsiouras <mipatsio@gmail.com>
+Date:   Sat Nov 15 15:33:25 2014 +0200
+
+    RSVP: Add support of GMPLS Support for Metro Ethernet Forum and G.8011 (RFC 6004)
+    
+       This document describes a method for controlling two specific types
+       of Ethernet switching via Generalized Multi-Protocol Label Switching
+       (GMPLS).  This document supports the types of switching corresponding
+       to the Ethernet services that have been defined in the context of the
+       Metro Ethernet Forum (MEF) and International Telecommunication Union
+       (ITU) G.8011.  Specifically, switching in support of Ethernet private
+       line and Ethernet virtual private line services are covered.  Support
+       for MEF- and ITU-defined parameters is also cover
+    
+    Bug: 7841
+    Change-Id: I12e12d01d497bd0e9703efcf6bd8ad100805bccc
+    Change-Id: I180c095652604bc025ab81171dd8a042e0930f08
+    Reviewed-on: https://code.wireshark.org/review/5323
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 4b96030
+commit 06ddb7e
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Thu Oct 30 09:16:51 2014 +0100
+Date:   Tue Jan 13 11:45:15 2015 +0100
 
-    802.11: Remove proto_tree_add_text
+    CAPWAP: Add a IEE802.11 Message Element Type (RFC5416)
+    
+    * IEEE 802.11 Information Element (1029)
     
-    Change-Id: I40d351e3317ff7e207e5c68a39aaedb73faf54f9
-    Reviewed-on: https://code.wireshark.org/review/5281
+    Add add_tagged_field to packet-ieee80211.h (will be used by other dissector)
+    
+    Change-Id: Icd13be416ccc47fb2309b9962e9a47c339885d1e
+    Reviewed-on: https://code.wireshark.org/review/6524
     Reviewed-by: Michael Mann <mmann78@netscape.net>
     Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit c2f971d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 17 21:16:19 2014 -0800
+commit fcd2d4f
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Wed Jan 14 23:05:02 2015 +0000
 
-    Fix indentation.
+    Fix cmake-cflags
     
-    Change-Id: Icc474748f755c21d281620c3b0f5d4d90f09223b
-    Reviewed-on: https://code.wireshark.org/review/5380
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 36837a2
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 17 23:22:08 2014 +0100
-
-    MIPv6: display Experimental Mobility Message Data as such
+    The flags that are deleted are already supplied by the CMake generator.
     
-    Bug: 10703
-    Change-Id: I9b16f503418d7464234be3c772b5dae3fb5eb7a9
-    Reviewed-on: https://code.wireshark.org/review/5378
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: Ifafc2343ac0c5d365a39f4a181b23f54c65bce74
+    Reviewed-on: https://code.wireshark.org/review/6538
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
 
-commit 1dec509
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Mon Nov 17 16:43:39 2014 -0800
+commit cb1f8a3
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 12 18:14:00 2015 +0100
 
-    voip_calls: Move to ui.
+    CAPWAP: Add some IEE802.11 Message Element Type (RFC5416)
     
-    Move voip_calls.[ch] to ui. Add callbacks to voip_calls_tapinfo_t.
-    Remove unused function definitions.
+    * IEEE 802.11 OFDM Control (1033)
+    * IEEE 802.11 Update WLAN (1044)
     
-    Change-Id: Ib12db7053d53afa81ef2a66dc0cfe681bc624dd2
-    Reviewed-on: https://code.wireshark.org/review/5379
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I702de1d649b1dc2af1de83ee21152c6a18f42dfc
+    Reviewed-on: https://code.wireshark.org/review/6509
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit a07f081
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 16 11:32:11 2014 -0800
+commit f6021e8
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Mon Jan 12 17:13:28 2015 +0100
 
-    voip_calls: Get rid of global variables.
-    
-    Move the members of voip_rtp_tapinfo_t to voip_calls_tapinfo_t. Move a
-    bunch of formerly static variables there as well. Note that we might
-    want to make them private again at some point. Remove launch_count. It
-    appeared to be unused.
+    CAPWAP: Add a new Message Element Type (RFC5415)
     
-    Wrap the individual registration routines in voip_calls_init_all_taps.
-    Wrap the removal routines in voip_calls_remove_all_tap_listeners.
+    * Delete Station (18)
     
-    Move voip_calls_get_info() to voip_calls_dlg.c. Make it static.
-    
-    Change-Id: I58f9d91f55cfb5e4b0c048a5a1d5d4b947f4641b
-    Reviewed-on: https://code.wireshark.org/review/5372
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I33afa96d183b8ff22725d2e00dcfeccea3fdfa04
+    Reviewed-on: https://code.wireshark.org/review/6508
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 5c7c701
+commit d9ec8ab
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 17 19:10:14 2014 +0100
+Date:   Sun Jan 4 13:16:47 2015 +0100
 
-    802.11: Enhance Supported Operating Classes
+    mate_util: fix parameter ... not found in the function declaration [-Wdocumentation]
     
-    * Use expert_info to display warning about length (Remove proto_tree_add_text)
+    Change-Id: I66af53ee06866b45339814b5fa949551c0dd45c1
+    Reviewed-on: https://code.wireshark.org/review/6535
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 6f630c1
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Wed Jan 14 21:04:32 2015 -0500
+
+    Fix the compile: Use the new (double) variable.
     
-    Change-Id: I36ce6b6fc1138c53621da4913e23f9f1ceaaca50
-    Reviewed-on: https://code.wireshark.org/review/5369
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I38a9b0f55e9f19fe7f4f09f5eec2817dd822c6d0
+    Reviewed-on: https://code.wireshark.org/review/6542
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 4b63d9f
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 17 19:03:46 2014 +0100
+commit b63a942
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jan 14 16:55:40 2015 -0800
 
-    802.11: Enhance Extenede Channel Switch Announcement
+    Fix a crash in the GTK+ RTP Streams dialog.
     
-    * Use expert info to display warning about launch (remove proto_tree_add_text)
-    * Remove a check about Unknown data (Not need)
+    Make sure we copy guint, gdouble, and gchar * data to variables of the
+    correct type. Fixes a crash when trying to copy CSV data (we were trying
+    to stuff a gdouble into a char *).
     
-    Change-Id: I3ec1d0f5b955019cfe43141df5f712eb1446dce3
-    Reviewed-on: https://code.wireshark.org/review/5368
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I3cbcc48216a078f85f13860d14707f309b9820d7
+    Reviewed-on: https://code.wireshark.org/review/6541
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit f4ad915
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 17 21:43:36 2014 +0100
+commit d443db0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jan 14 16:41:38 2015 -0800
 
-    H248: Fix Dereference of null pointer found by Clang analyzer
-    
-    Also fix some indent issue
+    Fix indentation.
     
-    Change-Id: I262bdddd031fec6a0f91b7172bb2d67be3c33000
-    Reviewed-on: https://code.wireshark.org/review/5370
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I089d18d6dde56c04d75f7c991511728a0a66f699
+    Reviewed-on: https://code.wireshark.org/review/6540
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit da69b51
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 17 21:59:14 2014 +0100
+commit 9a19d6d
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Wed Jan 14 15:13:40 2015 -0800
 
-    DECT: ensure that bfield_data buffer is always fully initiated
+    CMake: Look for FOP and HHC only when needed.
     
-    Bug: 10710
-    Change-Id: I444bc4ff7e542a8aa5ac8e20bac44a823ac74cfd
-    Reviewed-on: https://code.wireshark.org/review/5371
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    FOP is only required for generating PDF output and HHC is only needed
+    for CHM output. Don't look for them unconditionally.
+    
+    Change-Id: I7bec7d061c9e9e8b99431cab873e8c719469552c
+    Reviewed-on: https://code.wireshark.org/review/6539
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 7a7a763
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Nov 17 21:12:54 2014 +0100
+commit 242f711
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jan 13 13:32:12 2015 -0800
 
-    cmake:
-      Avoide rebuilding the guides each and every time.
-      Don't print the single file guides to stdout.
+    CMake: Update windeployqt discovery.
     
-    Change-Id: Ie94fc4b24676e9abc7258c4ea1c7fd3049a96fb6
-    Reviewed-on: https://code.wireshark.org/review/5367
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Update the comments and add a URL. Use HINTS, which is more correct
+    according to the documentation.
+    
+    Change-Id: I82a7e2790dfa0b398e2b534f9f45851f55bdc0d2
+    Reviewed-on: https://code.wireshark.org/review/6536
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 4a86d62
-Author: Joerg Mayer <jmayer@loplof.de>
-Date:   Mon Nov 17 21:05:11 2014 +0100
+commit 5b8fa72
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jan 13 13:32:12 2015 -0800
 
-    Use ntoh24 instead of less readable and less correct code.
-    Remove redundant / wrong comments.
-    Add two small (helpful) comments :-)
+    CMake: Copy Qt DLLs to the target directory.
     
-    Change-Id: I9c5451587d744a8418e6a90139b771a055e93387
-    Reviewed-on: https://code.wireshark.org/review/5366
-    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
+    Add a "copy_qt_dlls" target similar to "copy_cli_dlls". Wireshark.exe
+    must exist before windeployqt can be run, so we can't create a PRE_BUILD
+    target. Add copy_qt_dlls to the default target instead.
+    
+    Change-Id: If85d89478472b10b31229413465955fe98b0ef02
+    Reviewed-on: https://code.wireshark.org/review/6529
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 82bb363
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Mon Nov 17 17:10:36 2014 +0100
+commit 86fde78
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jan 13 10:15:18 2015 -0800
 
-    LLDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    CMake: Copy wireshark-gtk dependent DLLs to the target directory.
     
-    Change-Id: I8c750ed9ad775b9be9d12050d200d7f1b4ddb86e
-    Reviewed-on: https://code.wireshark.org/review/5365
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Add a "copy_gtk_dlls" target similar to "copy_cli_dlls".
+    
+    Change-Id: Id1df1d0ec00c46fccec90c4b8c0c8a2d2a14766a
+    Reviewed-on: https://code.wireshark.org/review/6527
+    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 3ce0167
+commit 20e2c05
 Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Nov 17 13:36:17 2014 +0100
+Date:   Wed Jan 14 13:47:08 2015 +0100
 
-    [BSSMAP] de_mid() used with wrong length.
+    [E212]Modify dissect_e212_mcc_mnc() to take E212 number type as an
+    argument. While at it remove deprecated APIs
     
-    Change-Id: Ia64f254d85845ff39eacc7a339fdfa646ff9bb50
-    Reviewed-on: https://code.wireshark.org/review/5364
+    Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6
+    Reviewed-on: https://code.wireshark.org/review/6534
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3815b14
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Mon Nov 17 10:44:36 2014 +0100
+commit 36aca29
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Mon Jan 12 15:12:04 2015 +0000
 
-    E212: fix bytes highlighting when dissecting the high nibble variant
+    Minor Development Guide updates
     
-    Change-Id: I376dcb333f7768242dbdb73313870e1e22d959ff
-    Reviewed-on: https://code.wireshark.org/review/5362
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Corrected info about paths to built executable.
+    Cross referenced empty debugger sections to the section with info.
+    
+    Change-Id: I4366825990f1a5286c7292c9f00e540160c1b5d0
+    Reviewed-on: https://code.wireshark.org/review/6520
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
 
-commit bea106c
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 14 15:12:06 2014 -0500
+commit 0ee179c
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jan 13 23:18:37 2015 +0100
 
-    Eliminate proto_tree_add_text
+    HTTP: allocate header_name in packet scope instead of file scope
     
-    Also some other cleanup to simplify dissector logic.
+    While we are at it, factorize the copy of value string
     
-    Change-Id: Ia84300b7eadafe292361014dd0e565ec250cae44
-    Reviewed-on: https://code.wireshark.org/review/5311
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Change-Id: I2a16155641b8bd8623baf51f787a5f450e7b3803
+    Reviewed-on: https://code.wireshark.org/review/6530
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit f3f833c
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Tue Nov 11 21:05:03 2014 +0100
+commit 63a3d04
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Jan 13 15:13:40 2015 -0800
 
-    display filter: the body of a range should only be
-    a string, a field name or another range - not an unparsed element
+    Consistently use the "g_string_free returns a C string pointer" idiom.
     
-    Bug: 10690
-    Change-Id: I126143636c940cc73ed6467660f0a573209e2ae9
-    Reviewed-on: https://code.wireshark.org/review/5243
-    Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Martin Kaiser <wireshark@kaiser.cx>
+    g_string_free(str, FALSE) frees the GString container but not the
+    underlying g_malloc()ed string; instead, it returns a pointer to the
+    g_malloc()ed string.
+    
+    Fix those places that didn't already get the string pointer from
+    g_string_free() to do so rather than manually extracting the string
+    themselves.
+    
+    And fix one place that didn't even need to use a string - it was just
+    scanning a C string without even modifying it.
+    
+    Change-Id: Ibbf4872bf5b9935b9907f539b6edb1013f3053a5
+    Reviewed-on: https://code.wireshark.org/review/6532
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 25f950e
+commit 9f5e4fb
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 16 18:25:56 2014 -0800
+Date:   Tue Jan 13 13:00:59 2015 -0800
 
-    Add tshark -G dissector-tables to dump a list of dissector tables.
+    uat_load() and uat_save() return a success indication; use it.
     
-    That list doesn't show the entries in the dissector tables, just
-    information about the tables themselves.
+    Instead of always ignoring the return value, always check it, and only
+    report an error if it returns FALSE.
     
-    Clean up some tshark man page issues while we're at it.
+    (Alternative: have it return NULL on success and a pointer to a
+    g_malloc()ed string on failure.)
     
-    Change-Id: I70beee34110f5c0d58105944dd71105a8400f5ca
-    Reviewed-on: https://code.wireshark.org/review/5360
+    Fix a comment while we're at it.
+    
+    Change-Id: Icb72c9f47775b6552e3eb4fe5ddcc85482bfb5fb
+    Reviewed-on: https://code.wireshark.org/review/6528
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 57b7227
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 14 15:13:05 2014 -0500
+commit 25f010b
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Tue Jan 13 14:26:34 2015 +0100
 
-    Eliminate proto_tree_add_text by formatting field hf_opcua_ByteString in a few places.
+    MAC LTE: upgrade dissector to v12.4.0
     
-    Change-Id: I9606aa36b7d7b6bb2ef2e7685e6629163ca83ef7
-    Reviewed-on: https://code.wireshark.org/review/5312
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: Ieb5395a6ae7a1d7625fe645d0caf14008993d3d9
+    Reviewed-on: https://code.wireshark.org/review/6521
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 14bc6d8
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Sun Nov 16 12:17:40 2014 -0500
+commit bc23f79
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Tue Jan 13 12:13:45 2015 -0800
 
-    Remove some ununused/unmatched <resources/> tags.
+    UAT error string pointers should not be const pointers.
+    
+    UAT error strings are usually allocated by g_strdup() or
+    g_strdup_printf(), and must ultimately be freed by the caller.
+    
+    Make the pointer-to-error-string-pointer arguments to various functions
+    be "char **", not "const char **".
+    
+    Fix cases that finds where a raw string was being used, as that won't
+    work if you try to free it; g_strdup() it instead.
+    
+    Add a missing free of an error string.
+    
+    Remove some no-longer-necessary casts.
+    
+    Remove some unnecessary g_strdup()s (the string being handed to it was
+    already g_malloc()ated).
+    
+    Change some variable declarations to match.
+    
+    Put in XXX comments for some cases where the error string is just freed,
+    without being shown to the user.
     
-    Change-Id: I0f8e4381b27d1defeb5980692823d297d2f48bab
-    Reviewed-on: https://code.wireshark.org/review/5349
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0
+    Reviewed-on: https://code.wireshark.org/review/6525
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit cacbffe
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Sun Nov 16 21:58:36 2014 +0100
+commit a988253
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Mon Jan 12 14:44:42 2015 -0800
 
-    PortableApps: ensure that the personal folder is set to the App directory
+    CMake: Copy libwireshark dependent DLLs to the target directory.
     
-    Otherwise the portable version ends up loading the user local personal profile
+    Add a "copy_cli_dlls" target which copies the DLLs required to run our
+    command line programs to the run directory.
     
-    Change-Id: Ib670c065319b0dd9673f239ae9459f6ee530f69e
-    Reviewed-on: https://code.wireshark.org/review/5351
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Fix the spelling of "KERBEROS". Start filling in variables so that we
+    can populate config.nsh.
+    
+    Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521
+    Reviewed-on: https://code.wireshark.org/review/6513
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit e26e1dc
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 16:12:40 2014 +0100
+commit 42e4040
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Jan 13 15:12:45 2015 +0100
 
-    BATMAN: fix indent and encoding args
+    [GPRS CDR]Fix faulty ASN1 modification
+    Should be: egsnPDPRecord                   [70] EGSNPDPRecordV750
     
-    use tabs for indent and use fix-encoding-args tools
+    Change-Id: I4b03524c09b6ce603cf4783144d588c8839a16e6
+    Reviewed-on: https://code.wireshark.org/review/6523
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit db7f25f
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Tue Jan 13 14:04:44 2015 +0100
+
+    [GPRS CDR] Handle Rel 7 CDRs
     
-    Change-Id: I5e066c6cbc429021cf21a55d5ffd5b60718ad5f8
-    Reviewed-on: https://code.wireshark.org/review/5340
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Change-Id: I09833a326e486273c3eacaceba0963fe88e0dac6
+    Reviewed-on: https://code.wireshark.org/review/6522
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 9d0085f
+commit f90eeb1
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 16 15:21:12 2014 -0800
+Date:   Mon Jan 12 20:35:44 2015 -0800
 
-    Make sure the NLPID appears in the protocol tree.
+    When allocating address structures, use wmem_new0().
     
-    For protocols for which the NLPID is not considered part of the PDU, put
-    the NLPID into the protocol tree ourselves.
+    For structures used as the data in an address, use wmem_new(), so that
+    structure padding is zeroed out; the comparison code for addresses
+    compares all bytes of the structure for addresses that are structures,
+    and the hashing code for hash tables using addresses as keys hash all
+    the bytes, so we have to make sure that, for addresses that are the
+    same, *all* bytes are the same.
     
-    Bug: 10706
-    Change-Id: I2676d1934dd468ec755a6f94d95a23f025ba0f25
-    Reviewed-on: https://code.wireshark.org/review/5358
+    Change-Id: I995fd26cc2f20edb5a599f95562b720561708e57
+    Reviewed-on: https://code.wireshark.org/review/6517
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 08a9478
+commit b204ff4
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Sun Nov 16 14:59:23 2014 -0800
+Date:   Mon Jan 12 20:07:09 2015 -0800
 
-    Fix a comment to reflect reality.
+    Do bounds checking when decompressing WCP packets.
+    
+    Extract the data offset and count only once, and make sure we don't run
+    past the end of the data we've copied from the packet; have
+    decompressed_entry() just do the decompression, rather than also
+    fetching the data offset and count.
     
-    Change-Id: I812b0246368266c76f7fe9ef355619603c5d37b0
-    Reviewed-on: https://code.wireshark.org/review/5357
+    Add some comments while we're at it.
+    
+    Bug: 10844
+    Change-Id: I2dc2f9594422ffa8f15fd5c57c9dac2e30e363f4
+    Reviewed-on: https://code.wireshark.org/review/6514
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7b558dd
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 2 16:15:31 2014 +0100
+commit 63d8e44
+Author: Jörg Mayer <jmayer@egg.fg-networking.de>
+Date:   Tue Jan 13 02:35:37 2015 +0100
 
-    Add unused-const-variable (enable by default on new clang release)
+    Fix ASCIIDOC detection broken by commit ae2888aeb2b418c9f62
     
-    Change-Id: I1d882e02188ba38ec1b5583c5933d0c92f0539e4
-    Reviewed-on: https://code.wireshark.org/review/5068
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Change-Id: I36cd42a9040e8f8ab2b11ff4211a1298663909a2
+    Reviewed-on: https://code.wireshark.org/review/6512
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 05acb67
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 16:28:51 2014 +0100
+commit de5e7b8
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Mon Jan 12 11:24:37 2015 -0500
 
-    mcast_stream: fix indent (use 4 spaces)
+    Fix casting compiler warning
     
-    Add also modelines info
-    
-    Change-Id: Idea65bfa25ce8a379c590074ab89a06f935c6648
-    Reviewed-on: https://code.wireshark.org/review/5344
+    Change-Id: I179706042168cb4fd1bfb5f9c573f302d9d62fa0
+    Reviewed-on: https://code.wireshark.org/review/6506
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7213ad5
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 16:42:32 2014 +0100
+commit 0b271aa
+Author: Evan Huus <eapache@gmail.com>
+Date:   Mon Jan 12 10:08:29 2015 -0500
 
-    rtp_stream: fix indent (use 4 spaces)
+    Remove ep_strbuf code
     
-    Add also modelines info
+    Thanks to Michael's work, it is now totally unused.
     
-    Change-Id: I4c4c6d7e292ba387aacb3f71afcac756b2875847
-    Reviewed-on: https://code.wireshark.org/review/5345
+    Change-Id: I67b5f7c69535a08f96f449c36c429e2548f4ea11
+    Reviewed-on: https://code.wireshark.org/review/6505
+    Petri-Dish: Evan Huus <eapache@gmail.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
 
-commit b867baf
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 16:15:27 2014 +0100
+commit f699f61
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Fri Jan 9 16:44:15 2015 -0500
 
-    BATMAN: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Error out if the user requests the SBC library but it's not found.
     
-    Change-Id: I6cfabc18921397002a2303f3511fa51bf5b41956
-    Reviewed-on: https://code.wireshark.org/review/5341
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I7c152420703d0d37c7b29d3c8f535b17180e020a
+    Reviewed-on: https://code.wireshark.org/review/6455
+    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 
-commit 9f0fb57
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 16:00:35 2014 +0100
+commit 7967ef9
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jan 9 19:50:09 2015 -0500
 
-    RADIUS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    Remove emem APIs from UAT functionality.
     
-    Change-Id: I5127b737c0d9db08c61a70bb6c16fef030d39f83
-    Reviewed-on: https://code.wireshark.org/review/5339
+    Change-Id: I009c09f25d170e5c9aaaef713eaacb3252817856
+    Reviewed-on: https://code.wireshark.org/review/6460
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
+    Petri-Dish: Anders Broman <a.broman58@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 0cc6a7e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Sun Nov 16 08:06:50 2014 -0800
+commit 554a397
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Mon Jan 12 13:58:49 2015 +0100
 
-    [Automatic manuf, services and enterprise-numbers update for 2014-11-16]
+    [GPRS CDR] Add expert info for unknown record types.
     
-    Change-Id: Ie677285f75a7ef0390d93469a4f97eaad813fdc0
-    Reviewed-on: https://code.wireshark.org/review/5346
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ib485f435b6c423b06c7c31f2cf681d01261bfc15
+    Reviewed-on: https://code.wireshark.org/review/6504
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 7f7d566
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sun Nov 16 15:27:06 2014 +0100
+commit d7bce33
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Mon Jan 12 11:26:59 2015 +0000
 
-    btavdtp: Add missing break;
+    Fix Cygwin path
     
-    Issue found by Clang Analyzer:
-    Value stored to 'codec_dissector' is never read
+    Fix the Cygwin path added for tests so that Cygwin comes after the
+    existing path and that the correct link command is found for exntest.
     
-    Change-Id: I7a9fc5e3ffd04c77cbbb8d5e5b885d8a29468cfd
-    Reviewed-on: https://code.wireshark.org/review/5330
-    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
+    Same change to runa2x.sh to be consistent.
+    
+    Change-Id: I177a5e7d17a0077b0e8ca7d264d7e725a5312e24
+    Reviewed-on: https://code.wireshark.org/review/6503
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Tested-by: Graham Bloice <graham.bloice@trihedral.com>
 
-commit b12be84
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 15 21:24:27 2014 -0500
+commit 0385d15
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Sun Jan 11 20:37:03 2015 +0000
 
-    Remove file_type_subtype member from packet_info.
+    Fix Cygwin path in runa2x.sh
     
-    Just pass the necessary data to the frame dissector.
+    As I don't have Cygwin on the path, the uname -o call failed.
+    The method used here seems to work reliably without needing Cygwin
+    on the path.
     
-    Change-Id: I1a4bab32f7b5e28f4e7707794d71b04dab388908
-    Reviewed-on: https://code.wireshark.org/review/5328
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    Change-Id: I206db542b5e89895a43c48626e2d14fff380fc8f
+    Reviewed-on: https://code.wireshark.org/review/6497
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
 
-commit d1696a6
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 15 18:47:06 2014 -0500
+commit a49e1d5
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Fri Jan 2 17:20:46 2015 +0000
 
-    "Bubble up" the use of pinfo->circuit_id and pinfo->ctype to make it more obvious where in used in hopes that it can be eliminated through passing dissector data (or methods other than using packet_info)
+    Make running the tests a little easier on Windows
     
-    Change-Id: Ib0e7efc123a3f9c06f58b5579c3c25b18818205c
-    Reviewed-on: https://code.wireshark.org/review/5326
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    1.  Set the igncr option a little differently, this is the preferred
+        way according to the latest Cygwin bash update announcement
+        (See https://sourceware.org/ml/cygwin-announce/2014-10/msg00015.html, Sect 4a)
+        The previous way didn't work for me.
+    2.  Ensure /usr/bin is on the path if running under Cygwin.
+        I really don't want Cygwin on my normal paths, the build process
+        adds if required, so this change makes the test scripts do the same.
+    
+    Change-Id: I0f4da1fa87802bf0a4039bb5a91e577fae506d79
+    Reviewed-on: https://code.wireshark.org/review/6243
+    Tested-by: Graham Bloice <graham.bloice@trihedral.com>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
 
-commit f92ed4d
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sat Nov 15 20:35:51 2014 -0500
+commit 2619edd
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Fri Jan 9 16:39:47 2015 +0100
 
-    Remove ipproto member of packet_info.
+    [E212] Make it possible to use different filters for MCC and MNC in LAI
+    RAI and SAI.
     
-    All situations can be handled with "shimmed" dissector functions.
-    
-    Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8
-    Reviewed-on: https://code.wireshark.org/review/5327
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I2abcc868899b8752f66347b3a0fe190670c3ce3f
+    Reviewed-on: https://code.wireshark.org/review/6447
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 3b8ed36
+commit e974a6f
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Fri Nov 14 17:42:44 2014 +0100
+Date:   Sat Jan 10 16:13:31 2015 +0100
 
-    DNS: NAPTR RR Replacement Length is incorrect
+    msg_rng_rsp (Wimax): fix Copy-paste error (CID 11158604)
     
-    It seems the Replacement Length field calculated by Wireshark (which Wireshark calls "rReplacement Length"), is the length of the first label of the DNS name in the Replacement, instead of the entire DNS name length.
+    Change-Id: I134d8178d741d741404963a89f60e1d1bfd9a2dd
+    Reviewed-on: https://code.wireshark.org/review/6473
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+
+commit 706c625
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Fri Dec 19 11:09:28 2014 +0100
+
+    ISIS: Add code and length for SubTLV Extended IS Reachability
     
-    Issue found by Boaz
+    * remove some proto_tree_add_text call
     
-    Bug:10700
-    Change-Id: I8b726f3a3bf316d688a40c3ade100d255ca3be42
-    Reviewed-on: https://code.wireshark.org/review/5300
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: I18bc26cc95934e77b19d24edbb417af4c895d53e
+    Reviewed-on: https://code.wireshark.org/review/6468
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 4960171
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Nov 15 10:36:16 2014 -0800
+commit ca17499
+Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
+Date:   Fri Jan 9 16:47:44 2015 -0500
 
-    VoIP calls: Fixup whitespace.
+    Add DJI UAV Drone Control Protocol to the list of new protocols.
     
-    Set modelines and reindent to match the files in the top-level ui
-    directory.
+    (This change also brings NEWS up to date with release-notes.asciidoc)
     
-    Change-Id: I7ea221e76a4b0ad3b6bcf7a3c8b4645c16aecbba
-    Reviewed-on: https://code.wireshark.org/review/5325
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: Ie61c27901947210ddf95bbb1bb8c36e489bc0c8c
+    Reviewed-on: https://code.wireshark.org/review/6456
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 51c5b7a
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sat Nov 15 09:18:06 2014 -0800
+commit 4a0ec75
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sun Jan 11 13:18:39 2015 -0800
 
-    VoIP calls: Start separating common and GTK+-dependent code.
+    Use the GTK+ 2 name for VoidSymbol.
     
-    Remove more calls to voip_calls_get_info. Get rid of the global cfile.
-    Lowercase more function names.
+    We can use the GTK+ 2 GDK_xxx names with GTK+ 2 or 3; apparently, some
+    versions of GTK+ 2 don't support the GDK_KEY_xxx names.
     
-    Change-Id: Ieda779779cce9f05e07c54314bceab4a18bae22f
-    Reviewed-on: https://code.wireshark.org/review/5324
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I52b14a7f2273f2af2b914c3646eb33d21673057e
+    Reviewed-on: https://code.wireshark.org/review/6498
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 7f3f4a5
-Author: Robert Grange <robionekenobi@bluewin.ch>
-Date:   Sat Nov 15 11:35:09 2014 +0100
+commit 528a857
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Sat Jan 10 21:29:57 2015 +0000
 
-    paquet-mq: Eliminiate proto_tree_add_text
+    Fix CMake generation and use of Windows .rc files
     
-    Eliminate proto_tree_add_text for Expert Info
-    Improve PCF Parameters numeric value display
+    CMake now generates local copies of .rc files for all the Windows
+    components and uses the files in the build of the components.
     
-    Change-Id: Ibc259ba05d0591d434e7638d91d6943101d45305
-    Reviewed-on: https://code.wireshark.org/review/5080
-    Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
+    The .rc.in files that include an icon were modified to allow the icon
+    path to be set by CMake.  The path is removed for nmake builds.
+    
+    Updated build architecture detection, required for wireshark.manifest.in
+    
+    Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8
+    Reviewed-on: https://code.wireshark.org/review/6482
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
 
-commit d550b17
-Author: Gerald Combs <gerald@zing.org>
-Date:   Fri Nov 14 18:43:28 2014 -0800
+commit 7d004dc
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jan 11 20:53:11 2015 +0100
 
-    VoIP calls: Use our tap offsets.
+    Revert "Lemon: Update lemon tools"
     
-    Add convenience functions to convert between tap IDs and tapinfo
-    pointers. Use them to get rid of some calls to voip_calls_get_info().
+    This reverts commit 5855dd8d538eb81d4825961b1bf0d583bf96f751.
     
-    Lowercase function names. Remove more exit()s.
+    This Lemon update fails to compile on OSX and triggers asserts on other platforms
     
-    Change-Id: I187fdc505bc22cc05edafed9e97ede8279ea53f9
-    Reviewed-on: https://code.wireshark.org/review/5321
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91
+    Reviewed-on: https://code.wireshark.org/review/6496
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 0be9e7d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 19:37:32 2014 -0800
+commit c8c9917
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jan 11 15:35:08 2015 +0100
 
-    0.0 is a double, 0.0f is a float.
+    Fix some more regressions introduced in gecaa1f8
     
-    Change-Id: I882bbda2c579cfd7a1b96ce190541262193405e0
-    Reviewed-on: https://code.wireshark.org/review/5320
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 3428361
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Nov 14 19:30:42 2014 -0800
-
-    Fix a pointer type.
+    Convert one other set of static variables to pinfo scoped memory while we are at it
     
-    Change-Id: I5cc67fa320b3241d6793575d59e49160ef40b260
-    Reviewed-on: https://code.wireshark.org/review/5319
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: If550b76ef6a4dd2707d79de8579ac439d16dce79
+    Reviewed-on: https://code.wireshark.org/review/6490
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 3275ba2
-Author: Gregor Miernik <gregor.miernik@hytec.de>
-Date:   Tue Nov 4 11:53:39 2014 +0100
+commit 5855dd8
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Wed Aug 27 22:20:12 2014 +0200
 
-    LLDP: Dissector for Hytec specific extensions added
+    Lemon: Update lemon tools
     
-    It provides dissection of objects with additional neighbor and link information
-    defined by Hytec (pcap example available on wiki.wireshark.org/HYTEC).
-    Also OUI of "Hytec Geraetebau GmbH" added.
+    Fix warning: declaration shadows a variable in the global scope [-Wshadow]
     
-    Change-Id: I92119e46fd5f4c4b385ac3df3170a4766fe056b7
-    Reviewed-on: https://code.wireshark.org/review/5107
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Add include <config.h>
+    
+    Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_)
+    
+    Fix implicit conversion loses integer precision
+    
+    Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare]
+    
+    Fix function declaration isn’t a prototype [-Wstrict-prototypes]
+    
+    Fix warning: old-style function definition [-Wold-style-definition]
+    
+    Fix trailing whitespace
+    
+    Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake
+    
+    Fix -Wmissing-prototypes
+    
+    Remove unused function (acttab_free)
+    
+    Add basename the filename with only filename (no path...)
+    
+    Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d
+    Reviewed-on: https://code.wireshark.org/review/3976
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 1e2a3dc
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Nov 14 13:53:58 2014 -0800
+commit 74b20dc
+Author: Peter Wu <peter@lekensteyn.nl>
+Date:   Thu Dec 18 12:31:49 2014 +0100
 
-    VoIP calls: Clean up tap registration and removal.
+    gtk: fix crash on Broadway GDK backend
     
-    Start moving away from a global voip_calls_tapinfo_t. Pass the
-    voip_calls_tapinfo_t struct address to each registration and removal
-    routine.
+    The Broadway GDK backend does never sets event->string. This results in
+    a crash when filter_string_te_key_pressed_cb tries to read its contents.
     
-    All of the tap registration and removal routines are called at the same
-    time. Replace the individual registration tracking booleans with a
-    central one.
+    Since the documentation marks reading the string as deprecated, try to
+    handle the character conversion here. It is based on
+    _gdk_x11_event_translate_keyboard_string (from gtk+), but without trying
+    to interpret Escape as '\033', and without trying to convert control
+    characters (example: Ctrl + 1). A buffer of 6 bytes is used to hold a
+    UTF-8 code point (there is no zero terminator, so 7 bytes as found in
+    the original implementation is unnecessary).
     
-    Calling exit() from the GUI is rude. Don't do that.
+    As g_locale_from_utf8 returns dynamically allocated memory, change the
+    control flow to have a single exit point where pointers are freed as
+    needed.
     
-    Change-Id: I9535002e2905a45a8cfc9643590b5d2d360ffc24
-    Reviewed-on: https://code.wireshark.org/review/5318
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Reproduce with gtk3:
+    $ broadwayd :5
+    $ GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 wireshark-gtk
+    (now open http://localhost:8085/ and start typing in the display filter)
+    
+    Keys tested: e € (AltGr + 5) ü (AltGr + ", u)
+    In the X11 backend, these still get displayed correctly. In the broadway
+    backend however, the accents are missing due to a bug in the broadway
+    implementation.
+    
+    Change-Id: Ic1f0ee2b87cd573023ee8e966f06489b3b744dcf
+    Reviewed-on: https://code.wireshark.org/review/5832
+    Reviewed-by: Balint Reczey <balint@balintreczey.hu>
 
-commit 62fd2ac
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Fri Nov 14 15:18:23 2014 -0500
+commit ae2888a
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sat Jan 10 18:02:07 2015 -0800
 
-    Eliminate proto_tree_add_text from some plugin dissector files.
+    CMake: Try to fix Cygwin a2x discovery.
     
-    Change-Id: Ib2d900833a8763307be6b1cfc8df20d7019d2706
-    Reviewed-on: https://code.wireshark.org/review/5313
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I46ddd10ab533ff7114aa6a4241a9a261da19329c
+    Reviewed-on: https://code.wireshark.org/review/6487
+    Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit ba3bc1e
-Author: Gerald Combs <gerald@wireshark.org>
-Date:   Fri Nov 14 13:15:38 2014 -0800
+commit 9b9a06c
+Author: Robert Grange <robionekenobi@bluewin.ch>
+Date:   Sun Jan 11 12:57:06 2015 +0100
 
-    VoIP calls tap ID cleanup.
+    packet-mq: Avoid using sort in dissector
     
-    Remove all of the public dummy members from voip_calls_tapinfo_t. Use
-    pointer arithmetic to generate private, unique IDs instead.
+    Avoid using sort for string_value_ext. The string value are now
+    sorted at definition
     
-    We weren't removing the SUA listener. Do so. Use the correct M3UA ID.
+    Change-Id: I08452b0423289d04e55ed7e3573e74bfcc329865
+    Reviewed-on: https://code.wireshark.org/review/6488
+    Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
+    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+
+commit 9d55a0b
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Sun Jan 11 08:05:06 2015 -0800
+
+    [Automatic manuf, services and enterprise-numbers update for 2015-01-11]
     
-    Change-Id: I8e8cdb6addbc4868aebc004be20a2f57b4acf75b
-    Reviewed-on: https://code.wireshark.org/review/5315
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I2f9625ebc812095bd4c7464981a96b38c4548694
+    Reviewed-on: https://code.wireshark.org/review/6491
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 225c86f
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 15:59:38 2014 -0800
+commit f2bedeb
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sun Jan 11 14:54:24 2015 +0100
 
-    Do the "-z help" processing separately, and do it for Wireshark as well.
+    FDDI: fix a memory corruption introduced in gecaa1f8
     
-    Yes, Wireshark does a bunch of GUI stuff, and then takes the window down
-    before printing the help, but the same is true for some command-line
-    error messages as well.
-    
-    Change-Id: Id501468416c83308e4c0a9e7a66116d8d33a9d84
-    Reviewed-on: https://code.wireshark.org/review/5317
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Bug: 10845
+    Change-Id: I4d47711f397d9aaa965dff3e97478517f638a2e2
+    Reviewed-on: https://code.wireshark.org/review/6489
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 3554580
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 12:29:04 2014 -0800
+commit aa9376e
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Jan 10 19:19:04 2015 +0100
 
-    It's not missing, it's passed on.
+    LTE RRC: upgrade dissector to v12.4.0
     
-    Change-Id: Id1b1c7501f357667abb961948afdd816e13a7ad3
-    Reviewed-on: https://code.wireshark.org/review/5314
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I0bd6c124bd3aa0efe09db81135adc690751e08ae
+    Reviewed-on: https://code.wireshark.org/review/6477
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 1b4d51e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 12:24:51 2014 -0800
+commit d07364d
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jan 10 12:41:04 2015 -0500
 
-    Update Debian symbol files.
+    Restore #undef HAVE_STDLIB_H and #undef HAVE_STRING_H in kerberos dissector.
     
-    Change-Id: Iee66cf87d742780740b572b39c8ecf94f93dc142
-    Reviewed-on: https://code.wireshark.org/review/5310
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    These were removed when the kerberos dissector was switched to being a pure ASN.1 dissector (see dea68bf00f7c5872950814da81ba532a6372ccb3).
+    
+    Change-Id: I04177046250d039a750f4e4e4dd956d8beab23bc
+    Reviewed-on: https://code.wireshark.org/review/6476
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 99b6afb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 12:21:12 2014 -0800
+commit f5c4d06
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jan 10 19:04:06 2015 -0500
 
-    Add a name field to tap_param, for use in error messages.
+    Replace some "low hanging fruit" uses of emem.
     
-    Change-Id: Ia4317b61ff30e269eba0ee2ea2c46f1668544b1b
-    Reviewed-on: https://code.wireshark.org/review/5309
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Most of the remaining ep_ uses are grouped with specific functionality.
+    
+    Change-Id: I8fa64a17acc6bcdcf6891b2d28715ac0c58f1a4a
+    Reviewed-on: https://code.wireshark.org/review/6484
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 04ab731
+commit fdd6554
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 12:05:31 2014 -0800
+Date:   Sat Jan 10 16:26:46 2015 -0800
 
-    The registered -z parameter string shouldn't end with a comma.
+    Rename the FT_BYTES separator types to SEP_ from BASE_.
+    
+    There's no requirement for "display" field values to have names
+    beginning with BASE_; use SEP_, to indicate that they're separators.
     
-    If it ends with a comma, then, if you don't provide any parameters, you
-    get a "no such -z statistic" message followed by a list of available
-    statistics.
+    (And, yes, we should introduce SEP_NONE, with a value of 0, and use it.)
     
-    If it doesn't end with a comma, then, if you don't provide any
-    parameters *and* a parameter is required, you get a usage message, which
-    is more useful - and, in many of those cases, a parameter *isn't*
-    required.
+    While we're at it, fix BASE_SEMICOLON - the separator is a colon, not a
+    semicolon - and document SEP_SPACE in doc/README.dissector.
     
-    Change-Id: I81275ea41ad4611d8210ca3cb07c09f0abde58f2
-    Reviewed-on: https://code.wireshark.org/review/5308
+    Change-Id: I856aafda2c60b8320dffe287f0deb06a9604a2bf
+    Reviewed-on: https://code.wireshark.org/review/6486
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 4729e13
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 11:25:04 2014 -0800
+commit b4f5b6e
+Author: Graham Bloice <graham.bloice@trihedral.com>
+Date:   Sun Jan 11 00:05:42 2015 +0000
 
-    Add an optional flag and a type for UUID parameters for stat taps.
+    Update CMake "Project names" and Folders
     
-    For future use, with common code to parse the -z argument.
+    This gives a more structured layout in Visual Studio
     
-    Change-Id: Ib2a11bd5c91b5ac48ced2cd2d112b97c301ff72a
-    Reviewed-on: https://code.wireshark.org/review/5307
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I0da87a3e5ec759c69aeee031366cf287485cdac2
+    Reviewed-on: https://code.wireshark.org/review/6485
+    Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
+    Tested-by: Graham Bloice <graham.bloice@trihedral.com>
 
-commit 42c6e57
-Author: Stephen Fisher <sfisher@sdf.org>
-Date:   Fri Nov 14 12:17:36 2014 -0700
+commit b2f03cb
+Author: Gerald Combs <gerald@zing.org>
+Date:   Sat Jan 10 14:41:55 2015 -0800
 
-    Update my e-mail address again.
+    make-version.pl updates.
     
-    Change-Id: I0083bbf84658dbb0d4cef91e9e8f5855b8a2ba4f
-    Reviewed-on: https://code.wireshark.org/review/5306
-    Reviewed-by: Stephen Fisher <sfisher@sdf.org>
-
-commit c3582a6
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 10:55:50 2014 -0800
-
-    There's nothing GTK+ about TShark.
+    Set the version variables in CMakeLists.txt directly from
+    make-version.pl instead of pulling them from configure.ac.
     
-    Remove gtk from routine names in CLI taps.
+    Use the correct default value for VERSION_EXTRA in config.nmake.
     
-    Change-Id: I0846da9b1e8119ed966b441cb1ca0ce1820fd1c8
-    Reviewed-on: https://code.wireshark.org/review/5305
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    wireshark-common.files was removed in g97e1491. We don't need to update
+    it any more.
+    
+    Change-Id: I751b6df9ac16e19090712aa79a68e308397c1d25
+    Reviewed-on: https://code.wireshark.org/review/6483
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 4d3c4c4
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 10:51:40 2014 -0800
+commit 2219f78
+Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
+Date:   Sat Jan 10 19:48:05 2015 +0000
 
-    Rename stat_cmd_args.[ch] to stat_tap_ui.[ch].
+    Netflow: do transport resolution on ports (if know they are UDP or TCP)
     
-    The intent is to handle more than just command-line arguments; reflect that.
-    
-    Change-Id: Ia10efda85a9d11c6579d1bec6f789cee30d9e825
-    Reviewed-on: https://code.wireshark.org/review/5304
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I8fc3675f03b7eaec6a9385638197067981762a70
+    Reviewed-on: https://code.wireshark.org/review/6474
+    Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
+    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
 
-commit 0dae81b
-Author: Irene Ruengeler <ruengeler@wireshark.org>
-Date:   Fri Nov 14 10:06:51 2014 +0100
+commit 14cad60
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sat Jan 10 14:20:06 2015 -0500
 
-    Allow SCTP graphs to resize with the window they're in.
+    Remove ep_ allocated memory from get_conversation_filter and just return a g_alloced string.
     
-    Bug: 10698
-    Change-Id: I3304bd36945619aeb405c74917f21de3faa3fcbb
-    Reviewed-on: https://code.wireshark.org/review/5284
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: Ie7f6b2c5479fec1a44afb5e446ef6abf304113af
+    Reviewed-on: https://code.wireshark.org/review/6480
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit a21436e
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 10:42:26 2014 -0800
+commit 59c1e32
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Fri Jan 9 12:51:15 2015 -0500
 
-    tap_ui -> stat_tap_ui.
+    Add BASE_SPACE for FT_BYTES
     
-    The old routine had stat_ in the name, as the expectation was that they
-    were for statistics taps; that's still the expectation, so have stat_ in
-    the data structure and routine names.
+    It's just like BASE_DOT, BASE_DASH and BASE_SEMICOLON, only its a space between bytes.  Since this seems pretty specific to FT_BYTES, perhaps there is a better was to represent the functionality (like FT_BOOLEAN uses numeric values for number of bits)?
     
-    Change-Id: Ic98d011012b8641173d41fa0ec4f4e625614370a
-    Reviewed-on: https://code.wireshark.org/review/5303
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I1a8f1ab263ece2736a8012b66fdd6a9105db7282
+    Reviewed-on: https://code.wireshark.org/review/6451
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 0e64efc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 10:35:42 2014 -0800
+commit effc826
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Sun Jan 4 11:17:53 2015 -0500
 
-    Use G_GUINT64_FORMAT to format a guint64.
+    Add preference to display spaces between bytes for FT_BYTES fields.
     
-    A 64-bit integer isn't necessarily a long, it might be a long long.  Use
-    G_GUINT64_FORMAT to format it.
+    I think this can make fields more readable (for a small amount of bytes).
     
-    Make it a guint64 while we're at it - the field is a FT_GUINT64.
+    Converted DeviceNet dissector to use proto_tree_add_item for some FT_BYTES field as tvb_bytes_to_str_punct was used to create this effect "manually".
     
-    Change-Id: I7ee855905ea77347576005441824b1c4630f5659
-    Reviewed-on: https://code.wireshark.org/review/5302
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I59e2acf9b00a4eb1279e6c2b2b7bd8ecef20db9b
+    Reviewed-on: https://code.wireshark.org/review/6304
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7390516
+commit 02fb290
 Author: Guy Harris <guy@alum.mit.edu>
-Date:   Fri Nov 14 10:31:04 2014 -0800
+Date:   Sat Jan 10 11:47:46 2015 -0800
 
-    For tap UIs, register a list of parameters and some menu information.
+    Sort the value_string_exts at dissector registration time.
     
-    The intent here is to centralize more UI information so that we can move
-    more tap UI stuff to common code.  This is a beginning.
+    You *CANNOT* defer it until dissection time, otherwise "tshark -G
+    values" will fail.
     
-    Change-Id: Ic35ac0c01bc7b942aab88177db4065847a5e6c30
-    Reviewed-on: https://code.wireshark.org/review/5301
+    Change-Id: I4edf9abda271baaf916f020a211b9add5543ecc7
+    Reviewed-on: https://code.wireshark.org/review/6481
     Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 09f0d2c
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 12 23:38:40 2014 -0500
+commit 531a9f0
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Sat Jan 10 11:39:43 2015 -0800
 
-    hiqnet: Improve dissection for hiqnet over TCP or UDP
-    
-    -- Use tcp_dissect_pdus() for hiqnet over tcp so as to properly
-        handle hiqnet PDUS is a TCP stream of data;
-    
-    -- Handle possible multiple hiqnet PDUs in a UDP payload.
+    Squelch a compiler warning.
     
-    -- Add Fixme: re multiple hiqnet PDUs in a frame.
+    The clang I'm using warns about a non-constant format string in
+    val_to_str_ext() calls; get rid of the unknown_format variable and,
+    instead, make two different proto_item_append_text() calls with
+    different format arguments in the val_to_str_ext()-call arguments.
     
-    Change-Id: I3527c6ea13571d16bcf23dd3771d0a89734a7c5a
-    Reviewed-on: https://code.wireshark.org/review/5267
-    Reviewed-by: Raphaël Doursenaud <rdoursenaud@free.fr>
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: Id668efe666634798c278958bd7e6d790ec476539
+    Reviewed-on: https://code.wireshark.org/review/6479
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit a55d18e
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Wed Nov 12 22:04:37 2014 -0500
+commit 51acf16
+Author: Robert Grange <robionekenobi@bluewin.ch>
+Date:   Fri Jan 9 11:06:10 2015 +0100
 
-    hiqnet: Simplify code somewhat; Adjust the "names" and display of certain fields.
+    packet-mq: sort some value_string_ext in dissector
     
-    Specifically: Use proto_tree_add_bitmask() to show the "flags" and
-                  "categories" bitfields (instead of building the fields
-                  display "by hand").
-                  The bitfield display changed as follows:
-                  - A bitfield with all bits=0 will have a detailed
-                    dissection tree; (for both 'flags' & 'categories');
-                  - The 'categories' individual bitfields are now
-                    displayed as FT_BOOLEAN (not FT_UINT32).
+    Some value_string_ext are sorted only in the dissector,
+    and only once.
     
-    Change-Id: Icd35698aae492b81b340d08030e6a1563f1640ae
-    Reviewed-on: https://code.wireshark.org/review/5266
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
-
-commit 9a1df71
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 14 15:39:45 2014 +0100
-
-    [S1AP) Wrong tree used
-    s1ap.cnf:547:14: error: variable 'subtree' set but not used
+    Adapted as said in comments.
+    Added test for sort in dissect_mq_spx
     
-    Change-Id: I84a345709b1ef9688f3f1a4e876a75dd575c1c2e
-    Reviewed-on: https://code.wireshark.org/review/5299
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: If72159fe96ab28a3ed540778d67996e152b4f110
+    Reviewed-on: https://code.wireshark.org/review/6444
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 56fa29e
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 14 14:53:02 2014 +0100
+commit b760da9
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Sat Jan 10 10:16:37 2015 +0100
 
-    [S1AP] Let the A21 dissector do further dissection of Cdma2000SectorID
+    MQ: ensure that at least 4 bytes were captured before doing heuristic checks
     
-    Change-Id: I8c503acf6860b34d24769cdf981dcaeea4667ffb
-    Reviewed-on: https://code.wireshark.org/review/5298
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit d6f2392
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Nov 14 13:39:29 2014 +0100
-
-    Fix declaration in btavrcp
+    Otherwise it could trigger an exception
     
-    Change-Id: I47e4ad2baa7ca4c48e8c0eea472e568fc06d3386
-    Reviewed-on: https://code.wireshark.org/review/5297
+    Change-Id: I280e3c5d9e5554e4be49035c03e0170ae4495e6e
+    Reviewed-on: https://code.wireshark.org/review/6463
+    Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
     Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit d7cc141
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Nov 12 12:00:46 2014 +0100
+commit 7600ddb
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Jan 10 16:12:29 2015 +0100
 
-    Bluetooth: Ubertooth: Update to the latest firmware
+    UTS: fix Copy-paste error (CID 11158603)
     
-    Changelog:
-    - add some assign numbers
-    - implement new type of usb_rx_packet: LE_PROMISC
-    
-    Change-Id: Iffe01a50f873221c695f16a76c1954d6c82d73df
-    Reviewed-on: https://code.wireshark.org/review/5289
-    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
-    Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: Ibabb8ab3ccb0543856c84822542baa1ac0139f7e
+    Reviewed-on: https://code.wireshark.org/review/6472
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 9952e7c
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Fri Nov 14 12:54:33 2014 +0100
+commit 15ac6eb
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Jan 10 16:12:07 2015 +0100
 
-    [BSSMAP] Handle vendor specific encoding of "Layer 3 Message Contents".
+    ISMACRYP: fix Copy-paste error (CID 11158602)
     
-    Change-Id: I351bc0a6a8ae636b2f888a80f61e526096a61b64
-    Reviewed-on: https://code.wireshark.org/review/5295
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: I4978627115f46a8aa90ccf67f7c008cdf9986da6
+    Reviewed-on: https://code.wireshark.org/review/6471
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit e83c7f0
-Author: Pascal Quantin <pascal.quantin@gmail.com>
-Date:   Fri Nov 14 10:07:52 2014 +0100
+commit e2fa5a5
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Jan 10 16:11:41 2015 +0100
 
-    NAS EPS: fix dissection of APN AMBR IE when first byte is set to 0xFE
+    CTDB: fix Copy-paste error (CID 11158596)
     
-    Bug: 10699
-    Change-Id: I0f359639d5836f557370ab6d6aad45faa4417b6e
-    Reviewed-on: https://code.wireshark.org/review/5285
-    Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
-    Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
+    Change-Id: Ieaa70505f4b880569be6126166a71f32d84f79a8
+    Reviewed-on: https://code.wireshark.org/review/6470
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit f172791
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Sun Nov 2 18:55:40 2014 +0100
+commit 6780519
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Jan 10 16:11:15 2015 +0100
 
-    Translations: Update Polish translation
+    NLM: fix Copy-paste error (CID 11158588)
     
-    All messages are translated now.
-    
-    Tłumaczenie Wiresharka jest teraz kompletne. Zachęcam do testowania
-    i wytykania błędów.
-    
-    Change-Id: Iaffb2e581c765b5b3dff7750f878e6391539ebd6
-    Reviewed-on: https://code.wireshark.org/review/5293
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: I0d2736f3e00c62bb908e346a641d0ddc8b171fd2
+    Reviewed-on: https://code.wireshark.org/review/6469
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit f1dee59
-Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Wed Nov 12 11:57:12 2014 +0100
+commit 0f6b09d
+Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
+Date:   Sat Jan 10 16:26:55 2015 +0100
 
-    Bluetooth: A2DP: Add AVRCP song position indicator
+    to_str (epan): fix parameter 'scope' not found in the function declaration [-Wdocumentation]
     
-    "sbc.avrcp_song_position" can be used to determine time synchronization
-    between AVRCP and A2DP. It is updated on every
-    AVRCP PlaybackPositionChanged. Also provide version for aptx.
-    
-    Change-Id: I48cd49f0fee54131a738290e2a70a24d33ba1d22
-    Reviewed-on: https://code.wireshark.org/review/5290
-    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Change-Id: Ie414d28415b71a79780d37fae454b90a7a610e1c
+    Reviewed-on: https://code.wireshark.org/review/6475
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit ad1977b
+commit 1a30c97
 Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Nov 13 10:52:16 2014 +0100
+Date:   Fri Dec 19 15:43:50 2014 +0100
 
-    Qt: Fix non-translate-able text
+    Bluetooth: A2DP: APT-X: Unhardcode stream configuration
     
-    Change-Id: I8c2376117ca1ac92c341ba938929af2d13e23f72
-    Reviewed-on: https://code.wireshark.org/review/5291
+    Change-Id: I16cfb4d014020a7fb2c67fef3128021c9901719a
+    Reviewed-on: https://code.wireshark.org/review/6442
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
     Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 6d678ff
+commit f343710
 Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Thu Nov 13 19:42:36 2014 +0100
+Date:   Mon Dec 29 09:45:40 2014 +0100
 
-    Qt: Fix typo
+    Bluetooth: HCI: Detect Vendor by "Read Local Version Information"
+    
+    There is information about manufacturer of Bluetooth chip.
+    Also try to detect if that "permament" info is not changed,
+    if so informs user about this rare event (probably there is an issue)
     
-    Change-Id: Idc2b945ac3bd5de961cc9c581398dc12f6831070
-    Reviewed-on: https://code.wireshark.org/review/5292
+    Change-Id: I1fa748a67ad7943e61d4445d240f0578b94560fc
+    Reviewed-on: https://code.wireshark.org/review/6408
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 38218df
+commit 55df238
 Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Nov 7 15:41:29 2014 +0100
+Date:   Mon Dec 29 08:53:15 2014 +0100
 
-    Bluetooth: AVRCP: Improve command/response trancing
+    Bluetooth: SMP: Add missing opcode for "Identity Address Information"
+    
+    Also fix tvb_length, tvb_length_remaining warnings.
     
-    Make command/response tracking field filterable and jumpable.
+    Bug: 10299
     
-    Change-Id: Ib0dfc9ea9954f8d29d06ceda3d44a7f95c94bc53
-    Reviewed-on: https://code.wireshark.org/review/5288
+    Change-Id: Ib8b55ea9f2220394a5896d13e5cc4e2cefff1e13
+    Reviewed-on: https://code.wireshark.org/review/6407
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
     Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 5a46f26
+commit d6e0409
 Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Fri Nov 7 10:47:33 2014 +0100
+Date:   Tue Dec 23 14:57:45 2014 +0100
 
-    Bluetooth: AVRCP: Fix swappend SongPosition and SongLength
+    Bluetooth: Add HCI Vendor Broadcom dissector
     
-    SongPosition and SongLength are swapped in Info column. Fix it.
+    Since those command/events are vendor specific and proprietary
+    not all commands/events are implemented. All implemented commands can be
+    found in Open Source implementations for Broadcom chip. If you found more,
+    please let me know.
     
-    Change-Id: I4c9bece51dbfe62885e8426a8aef07f336670099
-    Reviewed-on: https://code.wireshark.org/review/5287
+    Change-Id: Ie68d3737c88a8cef39260a9d93192cfc81871d6c
+    Reviewed-on: https://code.wireshark.org/review/6406
     Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 6e44997
+commit c69b2ab
 Author: Michal Labedzki <michal.labedzki@tieto.com>
-Date:   Mon Nov 3 10:14:28 2014 +0100
+Date:   Sat Jan 3 16:26:53 2015 +0100
 
-    Bluetooth: AVDTP: Add possibility to force decode as APT-X
+    Bluetooth: ATT: Dissect opcode with more precision
     
-    Change-Id: Id99647846c9bc7666f33938c811358576353390d
-    Reviewed-on: https://code.wireshark.org/review/5286
+    Change-Id: Iddc1a6d899b10b0d5c25723a71da7dcd11c6dfad
+    Reviewed-on: https://code.wireshark.org/review/6405
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
     Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 2986388
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 12 16:40:02 2014 +0100
+commit 7177ced
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Dec 17 16:12:41 2014 +0100
 
-    dtd_preparse : fix indent (Use tabs)
+    USB: Fix Conversation/Endpoint filters
     
-    Change-Id: Iec6ef7109ccea8a164db4f62af9fae1dceba6ae6
-    Reviewed-on: https://code.wireshark.org/review/5282
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    There were not fields for that, so simple add them.
+    
+    Change-Id: I489bae24ac96ea0baf395add731f4d62ccf19352
+    Reviewed-on: https://code.wireshark.org/review/6401
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 2788df9
+commit c93d0ab
 Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 12 17:10:40 2014 +0100
+Date:   Fri Jan 9 17:12:26 2015 +0100
 
-    Gtk Utils: fix unknown command tag name 'parm'; did you mean 'param'? (-Wdocumentation)
+    IS-IS: Incorrect decoding of IPv4 Interface/Neighbor Address sub-TLVs in Extended IS Reachability TLV
     
-    Change-Id: I89f242bf916d22e0a4a665696ec3fe5ee02b8a1f
-    Reviewed-on: https://code.wireshark.org/review/5283
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 6e535a8
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Nov 13 20:37:46 2014 -0500
-
-    Multipath TCP checksum requires M flag set as well as enough option length.
+    Correct 4-byte IPv4 address is incorrectly detected as wrong 6-byte IPv4 address and cannot be decoded (IPv4 Interface Address (sub-TLV type 6) and IPv4 Neighbor Address (sub-TLV type 8) of Extended IS Reachability TLV (TLV type 22) of IS-IS.
     
-    Bug: 10692
-    Change-Id: I8d9874a2c0a6b98497d43804bcf27a8c7e152a9b
-    Reviewed-on: https://code.wireshark.org/review/5275
+    Wrong offset for some Sub-TLV
+    
+    Issue found by Alexander Okonnikov
+    
+    Bug: 10837
+    Change-Id: I81d083722da72115e1905237352650d380e9d0ac
+    Reviewed-on: https://code.wireshark.org/review/6453
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 4a7dd62
+commit 5fe1f66
 Author: Michael Mann <mmann78@netscape.net>
-Date:   Thu Nov 13 22:38:54 2014 -0500
+Date:   Fri Jan 9 23:04:47 2015 -0500
 
-    Always create a subtree for Mobility options, even if it doesn't have a specific dissection function.
+    Finish off emem_strbuf_t usage.
     
-    Bug: 10618
-    Change-Id: Ic4d52485a6bd96f906b4a0d61b75a31bfad4e8f8
-    Reviewed-on: https://code.wireshark.org/review/5276
+    Change-Id: Ib0b911c86a7f8a7cca022e9e324c910664ce397e
+    Reviewed-on: https://code.wireshark.org/review/6461
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit c2e090f
-Author: Ryan Doyle <ryan@doylenet.net>
-Date:   Wed Nov 12 20:36:49 2014 +1100
-
-    Dissector for elasticsearch protocol
-    
-    Provides dissection for the elasticsearch protocol. This includes full
-    dissection of the multicast discovery protocol, the HTTP query interface
-    and partial dissection of the binary protocol.
-    
-    Change-Id: I738fb498976e44fa05168c2bc3a7e842a9e96df9
-    Reviewed-on: https://code.wireshark.org/review/4948
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 4cc4315
-Author: Sven Eckelmann <sven@open-mesh.com>
-Date:   Wed Oct 1 18:26:12 2014 +0200
+commit 3a9869d
+Author: Evan Huus <eapache@gmail.com>
+Date:   Fri Jan 9 12:28:10 2015 -0500
 
-    batadv: Add dissector support for batadv v15
+    Remove/replace ep_strsplit()
     
-    The packet format for batman-adv v15 supports:
-    
-     * Complete reordered packet type ids
-     * reordered flags
-     * type-version-length-value data containers
-     * new types for coding packets and unicast transfer of TVLVs
-     * dropped packet types for vis, translation table query and roaming
-     * reordered packet formats
-     * transparent fragmentation of batadv packets
-    
-    Change-Id: I9e6733f9dd6b54eeecda19cf570599161d28b46e
-    Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
-    Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
-    Reviewed-on: https://code.wireshark.org/review/5175
+    Change-Id: I4a803d83844d937804849b2ad3b067381c9b96d0
+    Reviewed-on: https://code.wireshark.org/review/6448
+    Petri-Dish: Evan Huus <eapache@gmail.com>
+    Reviewed-by: Evan Huus <eapache@gmail.com>
     Petri-Dish: Michael Mann <mmann78@netscape.net>
     Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 9cc9028
-Author: Lukas Emersberger <lukas.emersberger@br-automation.com>
-Date:   Fri Oct 17 14:13:06 2014 +0200
-
-    epl: Duplicated Frames
-    
-      Remake of the duplicated frames filter with
-      less memory usage.
-    
-    Change-Id: I7c8694b5ae69c919b866bbc661bad5e3f0a3e1d7
-    Reviewed-on: https://code.wireshark.org/review/4773
-    Reviewed-by: Roland Knall <rknall@gmail.com>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-
-commit ab7f35d
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Thu Nov 13 00:43:17 2014 -0800
-
-    hf_cc_loss is supposed to be a floating-point value, divided by 65535.
-    
-    That's what the code did when it used proto_tree_add_text(); make it do
-    so now.  That squelches a run-time error.
-    
-    Reformat the script-added hf_ values while we're at it.
-    
-    Change-Id: I48d16280c523faa3b266e8df37f5e0e0b2827712
-    Reviewed-on: https://code.wireshark.org/review/5270
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit 67f86dd
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 12 21:22:05 2014 -0800
-
-    Get rid of spaces before tabs.
-    
-    Change-Id: I70ff250a905ac578d7e3afc63a82a5fcb3983608
-    Reviewed-on: https://code.wireshark.org/review/5269
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
-
-commit d1ccc33
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 9 21:13:38 2014 -0500
+commit e54b5f0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jan 9 10:39:17 2015 -0800
 
-    Add dissector table for sFlow header dissection.
+    CMake: Copy admonition graphics to the correct directory.
     
-    Change-Id: I189a5b2d5f769395fa5e387f8be49b81903fb252
-    Reviewed-on: https://code.wireshark.org/review/5262
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Iecba4000c487a90efedfc7547771539c3748a7f0
+    Reviewed-on: https://code.wireshark.org/review/6454
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 17798bc
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 12 21:19:41 2014 -0800
+commit 8bd80e0
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jan 9 13:53:17 2015 -0800
 
-    Handle duplicate attribute and TLV entries specially.
-    
-    For attributes, handle them the same way we handle duplicate vendors.
+    CMake: Set WIRESHARK_TARGET_PLATFORM.
     
-    For TLVs, ignore duplicates; they shouldn't happen.
+    Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt.  It's used
+    by a couple of our modules and will be used for NSIS packaging.
     
-    Change-Id: Ie968478c40a9b7848fa8ea25b144eda8656e5874
-    Reviewed-on: https://code.wireshark.org/review/5268
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11
+    Reviewed-on: https://code.wireshark.org/review/6458
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit f8e24c9
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Wed Nov 5 23:07:35 2014 -0500
+commit a81f0d1
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jan 9 14:15:39 2015 -0800
 
-    Eliminate proto_tree_add_text for some dissectors.
+    Fix airpdcap debugging code.
     
-    Change-Id: Ide14bcac0b1563bee4260ac9c1a280ba99e97e71
-    Reviewed-on: https://code.wireshark.org/review/5261
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ied1094dd3c6ad176fea830c0857ba43e09d3cb10
+    Reviewed-on: https://code.wireshark.org/review/6457
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 0515087
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 12 19:01:26 2014 -0800
+commit 2bb26ea
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jan 9 10:23:51 2015 -0800
 
-    Handle new vendors and changes to vendors differently.
-    
-    If, when adding a new vendor, we already find a vendor with the given
-    ID, don't bother adding it to the vendors-by-ID table with the same ID,
-    and, if and only if the vendor name has changed, remove it from the
-    vendors-by-name table, free the old name, replace it with the new name,
-    and, add it back to the vendors-by-name table with the new name.
+    CMake: Copy CHM graphics from the correct source.
     
-    Bug: 10666
-    Change-Id: I43ebcb57c742563157c71b01ebc0b35797a408e1
-    Reviewed-on: https://code.wireshark.org/review/5265
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: Iea67bdaf8d83009c808bd39693fe273b3181ff76
+    Reviewed-on: https://code.wireshark.org/review/6452
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit f598fa8
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Wed Nov 12 18:11:00 2014 -0800
+commit f5de0c4
+Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
+Date:   Fri Jan 9 18:11:26 2015 +0000
 
-    Squelch a compiler warning.
+    Netflow: Fix some duplicate label names
     
-    Some compilers complain that we're casting a 16-bit integer to a
-    pointer; making it a standard-size integer squelches the warning.
-    
-    Change-Id: Iba0e767d7801afdc369b64a1cf050bf8db37da7b
-    Reviewed-on: https://code.wireshark.org/review/5264
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I077bdd6394898a445c00a1e7aec1c4c11b3e9ec2
+    Reviewed-on: https://code.wireshark.org/review/6450
+    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
 
-commit f7d91bd
-Author: Gerald Combs <gerald@zing.org>
-Date:   Tue Nov 11 09:56:58 2014 -0800
+commit 4f65899
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Fri Jan 9 08:58:15 2015 -0800
 
-    Qt: Flatten group boxes.
+    CMake: Migrate to hhc.cmake.
     
-    As discussed in change 5185, the "big 3" HIGs discourage the use of
-    traditional group boxes. Flatten our existing ones.
+    Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the
+    hhc.cmd wrapper.
     
-    Change-Id: I68ef4aa9fd0f69a42750bf735df2250a468bfb2d
-    Reviewed-on: https://code.wireshark.org/review/5263
+    Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c
+    Reviewed-on: https://code.wireshark.org/review/6449
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 6df5252
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 9 15:44:56 2014 -0500
+commit ffb6f10
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jan 8 17:16:09 2015 -0800
 
-    Add Decode As functionality for MPLS PW Associated Channel Type.
-    
-    Add CFM and MPLS dissector as possible decoders.
+    CMake: Cygwin-ify the xmllint path as well.
     
-    Bug: 10574
-    Change-Id: Ic39c6b8d68b965ff9d342f5ee789a8eff3134a5a
-    Reviewed-on: https://code.wireshark.org/review/4935
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I5e62ed6baeed3fcb76cdffd30666ad01713acd2a
+    Reviewed-on: https://code.wireshark.org/review/6439
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit ae1630d
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 12 12:57:36 2014 +0100
+commit 1b4f965
+Author: Dario Lombardo <lomato@gmail.com>
+Date:   Fri Jan 2 15:28:20 2015 +0100
 
-    Fix warning: no previous prototype for function ... [-Wmissing-prototypes]
+    Some typos fixed.
     
-    warning coming after g055e4768ece and g421913b721
-    
-    Change-Id: I5caeeb89c559faef8007f2946c68c7172b75dfa8
-    Reviewed-on: https://code.wireshark.org/review/5250
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I65df0c40d771c4854b73fd5c35d1af600f15f324
+    Reviewed-on: https://code.wireshark.org/review/6445
+    Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 
-commit 54aea45
+commit 872a239
 Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Wed Nov 12 14:15:48 2014 +0100
+Date:   Fri Jan 9 10:16:06 2015 +0100
 
-    [Art-Net]
-    - The heuristic chek was missing "e" out of "Art-Net\0"
-    - tvb_length() - tvb_captured_length()
+    Add missing #include ( "ui/gtk/old-gtk-compat.h" )
     
-    Change-Id: Iad9900f3a22e2fdbd0d6056efc1af90511cc458a
-    Reviewed-on: https://code.wireshark.org/review/5257
+    Change-Id: Ic53c3cd4a38c587ab3c0dcb9f8349ca50e338f80
+    Reviewed-on: https://code.wireshark.org/review/6443
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 63cf939
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Wed Nov 12 12:26:22 2014 +0100
+commit 284229c
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jan 8 13:16:01 2015 -0500
 
-    ADB: fix  warning: no newline at end of file [-Wnewline-eof]
-    
-    Warning found by Clang
+    Convert EUI64 address APIs to use wmem.
     
-    Change-Id: I7b801808aefa294e32fff560ea1a49620f0e0ea0
-    Reviewed-on: https://code.wireshark.org/review/5249
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
+    Change-Id: I57d2e435ac72ea07ec9a567e0b1ce4410966e3d2
+    Reviewed-on: https://code.wireshark.org/review/6419
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Petri-Dish: Michael Mann <mmann78@netscape.net>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit 2043c9d
-Author: Dario Lombardo <lomato@gmail.com>
-Date:   Wed Nov 12 11:06:45 2014 +0100
+commit 17f1a44
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Fri Dec 19 15:41:57 2014 +0100
 
-    Updates in it translation.
+    Bluetooth: AVDTP: Fix other-side Reconfigure
     
-    Change-Id: I9e90fca521f17f4ae49e132990f77b2610807e6d
-    Reviewed-on: https://code.wireshark.org/review/5248
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit f2d94e1
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 11 12:52:04 2014 +0100
-
-    PIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
+    It is used to properly configure internal SEP data using to
+    properly decode music stream.
     
-    Change-Id: I1540c7878692625a9e38b48f8681c07bab852a64
-    Reviewed-on: https://code.wireshark.org/review/5234
+    Change-Id: If8a15267ce072eaedfac947d7558be2d3e796483
+    Reviewed-on: https://code.wireshark.org/review/6404
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
     Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 219cf30
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Nov 11 15:22:12 2014 -0500
+commit 5be440f
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Thu Dec 18 10:42:01 2014 +0100
 
-    Fix SMPP timestamp decoding when the current date/time's offset to UTC is
-    different from the timestamp's offset to UTC.
+    Bluetooth: AVDTP/VDP: Add link to first and last packet in the stream
     
-    The fix for bug 6712 ignored the fact that daylight savings will affect the
-    offset from UTC--and whether daylight savings is in effect today might be
-    different than whether it was in effect in the timestamp we're decoding.
+    Useful for analyzing stream issues.
     
-    Bug: 10672
-    Change-Id: Ie513c361cff41007f2328cd9ca9ca4800ffef500
-    Reviewed-on: https://code.wireshark.org/review/5245
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I1c9f43807dc3abc050cf17c971fbd270b812faa5
+    Reviewed-on: https://code.wireshark.org/review/6402
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit cfd71d7
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Nov 11 20:48:39 2014 -0500
+commit 879a221
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Thu Dec 18 15:19:50 2014 +0100
 
-    Fix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up
-    on the OSX 10.5 buildbot.
+    Bluetooth: BTLE RF: Remove tree and reduce indentation level
     
-    Change-Id: I49e066feab8b980ea85371095234e96e89db71e1
-    Reviewed-on: https://code.wireshark.org/review/5247
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-
-commit ea5b234
-Author: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date:   Tue Nov 11 15:37:04 2014 -0500
-
-    Fix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up with gcc 4.8.3.
+    Useless check for tree avoid setting Bluetooth addresses.
     
-    Change-Id: I71c9013670dd6e8c74e039bd252cfac2c9e95a18
-    Reviewed-on: https://code.wireshark.org/review/5246
-    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
+    Change-Id: If38465679370c5ea74f6d916e409e337d60cf7db
+    Reviewed-on: https://code.wireshark.org/review/6403
+    Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
+    Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
+    Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
 
-commit 2f3e577
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Tue Nov 11 21:21:28 2014 +0100
+commit 6a6e2ef
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jan 8 12:13:18 2015 -0500
 
-    [GTP] Fix decoding of UMTS GTP QoS Profile i n Radius and Diameter
-    messages.
-    Fixes Bug 10688
+    Have ipxnet addresses use wmem scoped memory.
     
-    Change-Id: Iff29ae3f6cee1b4ad12a0e5c5d7fd3da1c9343af
-    Reviewed-on: https://code.wireshark.org/review/5244
+    Change-Id: I1d8eed2ceacccce2768590f0689cd2c83a5e56e9
+    Reviewed-on: https://code.wireshark.org/review/6418
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit feedcb0
-Author: AndersBroman <a.broman@bredband.net>
-Date:   Tue Nov 11 21:00:16 2014 +0100
+commit 456095c
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jan 8 11:54:36 2015 -0500
 
-    [Radius] Make dictionary.starent.vsa1 the default dictionary.
-    at least with the trace in Bug 10688 that makes the most sense.
+    disperse atalk-utils.[ch]
+    
+    The functionality was suiting for address_to_str.c and the #defines belong in packet-atalk.h.  Kept the address structure with the "address string conversion", but that can probably be better cleaned up when the address to str as a whole is cleaned up.
     
-    Change-Id: I76213449076a2f49a4b72c6dd87b022fb10b9eef
-    Reviewed-on: https://code.wireshark.org/review/5242
+    Would also consider making AT_ATALK an FT_ type as well.
+    
+    Change-Id: Ia534096c707e6fb94acdfee0d332beda6571c371
+    Reviewed-on: https://code.wireshark.org/review/6417
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
     Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b1c91b0
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 11 19:35:55 2014 +0100
+commit d296c75
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jan 8 13:59:33 2015 -0500
 
-    Tools: Add fix_pragma_wdocumentation to UNKNOWN licence
+    Some more random removal of ep_ memory.
     
-    Change-Id: Ib5665924b99644c52c95d408c7cff19509cf3eb2
-    Reviewed-on: https://code.wireshark.org/review/5241
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I6eccd20280e907bd9e6a5fcf873ccf80afddecac
+    Reviewed-on: https://code.wireshark.org/review/6416
+    Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit dfaaba8
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Tue Nov 11 12:56:34 2014 -0500
+commit 45cbdbc
+Author: AndersBroman <anders.broman@ericsson.com>
+Date:   Thu Jan 8 10:01:56 2015 +0100
 
-    hiqnet: Use correct filter names; Fix specification of hf_dhcp
-    
-       "foo.flags..." --> "hiqnet.flags...";
-       Use BASE_NONE for hf_dchp.
+    Add missing #include ( "ui/gtk/old-gtk-compat.h" )
     
-    Change-Id: Ic3ca4754a1daeefc831dbfcd6a280fe19f8efbf3
-    Reviewed-on: https://code.wireshark.org/review/5240
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I03ddea2fc7db52df1ff3571e196250bc5e3ff036
+    Reviewed-on: https://code.wireshark.org/review/6410
+    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit bd9ff6b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Sat Nov 8 18:21:07 2014 +0100
+commit fb40fd3
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Fri Jan 9 02:34:21 2015 +0100
 
-    Add tools for fix -Wdocumentation
-    
-    Use pragma to disable -Wdocumentation when include glib.h, gmodule or gtk/gtk.h
+    Add a possible replacement for the cmd hack to work around hhc.exe
+    returning non-null on success.
+    To be invoked via "cmake -P hhc.cmake <single-arg>".
     
-    Change-Id: I576c0d5c4a12ac3b505ac9543646356ff29ac814
-    Reviewed-on: https://code.wireshark.org/review/5198
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ib2584379c512cbd7f437f36ef932b372fe02203a
+    Reviewed-on: https://code.wireshark.org/review/6440
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit 7e2ede3
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 11 17:56:05 2014 +0100
+commit 4bc8d0f
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jan 8 16:55:26 2015 -0800
 
-    Hiqnet: fix warning found by fix-encoding-args tools
+    CMake: Try to fix the xsltproc path.
     
-    Change-Id: I7e513ec5b617217cd238861f5f02d44edce0bedd
-    Reviewed-on: https://code.wireshark.org/review/5239
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 0f4860b
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 11 17:50:17 2014 +0100
-
-    Hiqnet: fix Mac OS X buildbot
+    Try to make the xsltproc path compatible with Cygwin. This is a blind
+    attempt to fix the Windows 8 buildbot. It works fine locally.
     
-    Change-Id: Ia4fec86ed389ccb558fe9e1acfb6e87b7012bb75
-    warning: declaration of 'strlen' shadows a global declaration
-    Reviewed-on: https://code.wireshark.org/review/5237
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: Ib9d55dd07c6b17cfddf313716227d347109d2103
+    Reviewed-on: https://code.wireshark.org/review/6438
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 41cc80e
-Author: Alexis La Goutte <alexis.lagoutte@gmail.com>
-Date:   Tue Nov 11 17:54:09 2014 +0100
+commit 67b1593
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jan 8 16:16:56 2015 -0500
 
-    Hiqnet: fix typo lenght => length
+    Remove proto_tree_add_ax25
     
-    Change-Id: I104d8bb0c56899faef6f4d608859e7b1a34e45a4
-    Reviewed-on: https://code.wireshark.org/review/5238
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 8b5b0b3
-Author: Raphaël Doursenaud <rdoursenaud@free.fr>
-Date:   Mon Oct 20 13:07:56 2014 +0200
-
-    Initial Harman HiQnet dissector
+    There isn't a legitimate use for the API, all cases can be covered with proto_tree_add_item.  As a bonus, a few more tvb_get_ptr calls can be removed.
     
-    Change-Id: I43042edde09395e328d84bf4b172465829915a98
-    Reviewed-on: https://code.wireshark.org/review/5014
-    Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
+    Change-Id: I3bb86ba8f05ef3363407bcfe9b059ee27ebc135d
+    Reviewed-on: https://code.wireshark.org/review/6429
+    Reviewed-by: Michael Mann <mmann78@netscape.net>
 
-commit 7469fab
-Author: desolat <nuabaranda@web.de>
-Date:   Tue Nov 11 00:46:05 2014 +0100
+commit ecaa1f8
+Author: Michael Mann <mmann78@netscape.net>
+Date:   Thu Jan 8 17:07:25 2015 -0500
 
-    BACAPP: fix dissection of event parameters for event notifications of Event_Type Change_of_Status_Flags
+    convert variables that were static just because of SET_ADDRESS macro to use the proper pinfo->pool instead.
     
-    Implementation for this event parameter type was missing
-    
-    Bug: 9626
-    Change-Id: Iea0bc819858bbf5660d97cfd0c418a963ac149fb
-    Reviewed-on: https://code.wireshark.org/review/5228
+    Change-Id: I914918d9629f654ead497dddac0f412b690e4409
+    Reviewed-on: https://code.wireshark.org/review/6430
     Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Petri-Dish: Michael Mann <mmann78@netscape.net>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
 
-commit b2c2deb
-Author: Guy Harris <guy@alum.mit.edu>
-Date:   Mon Nov 10 19:47:59 2014 -0800
+commit a2abf8b
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Fri Jan 9 02:04:49 2015 +0100
 
-    Fix a problem that causes build failures with CMake on Yosemite.
+    Fix CMake Warning "Argument not separated from preceding token by whitespace."
     
-    Change-Id: I52e81656470df887eb3c53b2632bf5a310b1b063
-    Reviewed-on: https://code.wireshark.org/review/5229
-    Reviewed-by: Guy Harris <guy@alum.mit.edu>
+    Change-Id: I1ecd3bd0081c2f69d4e4f21f84cb46d086b657a2
+    Reviewed-on: https://code.wireshark.org/review/6437
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit afae2b6
-Author: David Ameiss <netshark@ameissnet.com>
-Date:   Mon Nov 10 14:24:18 2014 -0600
+commit ab717f2
+Author: Joerg Mayer <jmayer@loplof.de>
+Date:   Fri Jan 9 01:58:52 2015 +0100
 
-    Allow building under OSX Yosemite using cmake.
+    Use the FindHTMLHelp.cmake provided by cmake to find the hhc.
+    Lower case some function/macro calls.
     
-    CFPropertyListCreateFromStream() has been deprecated in Yosemite, in favor of CFPropertyListCreateWithStream(). The autotools
-    build checks for the existence of the new function, but the cmake build does not. So, add a check for it to CMakeLists.txt, and
-    update cmakeconfig.h.in to provide the "template" for HAVE_CFPROPERTYLISTCREATEWITHSTREAM.
-    
-    Change-Id: I1a4e3e1ce83092ecf7725527b921eeca80b18d4b
-    Note: CFPropertyListCreateWithStream() works under Mavericks as well.
-    Reviewed-on: https://code.wireshark.org/review/5226
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
+    Change-Id: I57532e3b4701963b88a536a7ecfe7dfaf4be3d4c
+    Reviewed-on: https://code.wireshark.org/review/6436
+    Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 
-commit c44ff77
-Author: Bill Meier <wmeier@newsguy.com>
-Date:   Mon Nov 10 15:07:51 2014 -0500
+commit 03f273a
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jan 8 15:39:27 2015 -0800
 
-    amqp: Misc changes;
+    HTML Help: Fix titles.
     
-    - amqp_1_0_dissectiom: Use MIN(32-bit-length, 0xFFFF) as the length to dissect;
-      The original code just used the low-order 16 bits of the 32-bit length
-      field  as the length to dissect.
-      Add an expert warning if the actual PDU length is > 65K.
+    AsciiDoc converts single quotes into curly quote entities, which HTML
+    Help doesn't support. Use sed to fixup the title string.
     
-    - tvb_length() --> tvb_reported_length()
+    We might want to drop HTML Help at some point.
     
-    Change-Id: I3230600f460a8bd495eeec17fa6e704bf24de1a2
-    Reviewed-on: https://code.wireshark.org/review/5225
-    Reviewed-by: Bill Meier <wmeier@newsguy.com>
+    Change-Id: I0c7d3be90c0de7dbac0f1367cc6ba323c7380939
+    Reviewed-on: https://code.wireshark.org/review/6435
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit bc990fc
-Author: Martin Kaiser <wireshark@kaiser.cx>
-Date:   Mon Sep 1 09:47:26 2014 +0200
+commit 315cc72
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Thu Jan 8 16:27:34 2015 -0800
 
-    USB: consider the device class when we try to select the next dissector
+    CMake: Revert the release notes xsltproc command.
     
-    at the moment, we only use the interface class, even in situations where
-    it's not applicable (e.g. control request that's not addressed to an
-    interface or an endpoint) - this is a hack that works because some
-    dissectors register for interface class "unknown", I'm trying to make
-    this workaround obsolete
-    
-    Change-Id: I6bf4253a2f8bf5a75ea1a08c3e52d36f80abd7ab
-    Reviewed-on: https://code.wireshark.org/review/5215
-    Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Sean Stalley <seanstalley@gmail.com>
-    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-
-commit 0f7aedc
-Author: AndersBroman <anders.broman@ericsson.com>
-Date:   Mon Nov 10 17:43:53 2014 +0100
-
-    Use correct offset and lenght for Choice EOC.
+    Should fix the release_notes_txt target.
     
-    Change-Id: I8152e1a07768a3bc245bbafa7c24901ba26a2478
-    Reviewed-on: https://code.wireshark.org/review/5224
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
+    Change-Id: Ie930c49ad34ad70070b8f7d28d79bee55f263c40
+    Reviewed-on: https://code.wireshark.org/review/6434
+    Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit 0f758fa
-Author: Victor Voronkov <victor.voronkov@gmail.com>
-Date:   Mon Nov 10 12:07:15 2014 +0100
+commit 1baf9bb
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jan 8 15:50:15 2015 -0800
 
-    WCCP: fix parsing of extended assignment data element
+    Use G_GINT64_CONSTANT() for 64-bit constants.
     
-    Bug: 10641
-    Change-Id: I51322757c5aa7877fa8ff7915330ff24e7a8cbe2
-    Reviewed-on: https://code.wireshark.org/review/5221
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I2b4f24c0e68f8d1edb53981b2ada7db6cd0eff72
+    Reviewed-on: https://code.wireshark.org/review/6433
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit ea16705
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Thu Nov 6 11:19:25 2014 +0100
+commit cd7408e
+Author: Gerald Combs <gerald@wireshark.org>
+Date:   Tue Jan 6 16:59:32 2015 -0800
 
-    Improved deregistering fields.
-    
-    This improvement avoids use of deallocated memory (crash) if using a
-    deregistered field in display filter, color filter, custom column and
-    other cases when the field is used as "interesting field".
-    
-    This functionality is currently used in http, imf and ldap preferences.
+    CMake: Enable DocBook on Windows.
     
-    Also removed unused proto_registrar_n() as this does not work correctly
-    after deregistering fields.
-    
-    Change-Id: I043e3bf7a98bd773c9801e712a012d1eab8a7f94
-    Reviewed-on: https://code.wireshark.org/review/5161
-    Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
-
-commit d58567b
-Author: Stig Bjørlykke <stig@bjorlykke.org>
-Date:   Wed Nov 5 14:36:29 2014 +0100
-
-    Fixed memory leakage in col_cleanup.
+    Add a wrapper script and CMake macros which lets us run Cygwin's a2x
+    from Windows. Add *another* wrapper script that ignores the return value
+    of hhc.exe.
     
-    Several fields in cinfo is allocated memory and must be freed here
-    to avoid memory leakage when recreating the packet list.
+    Move the ASCIIDOC2DOCBOOK macro to FindASCIIDOC.cmake. Add FindHHC.cmake.
+    Add hints to FindFOP.cmake.
     
-    Do not allocate memory for col_expr[] as this points to static strings
-    or other allocated strings.
+    Use unique file names in the HTML Help chain in an attempt to avoid a
+    race condition.
     
-    Change-Id: I840377e3c590b1a3e2a38e0537465a028041d1e9
-    Reviewed-on: https://code.wireshark.org/review/5137
-    Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
-    Reviewed-by: Anders Broman <a.broman58@gmail.com>
-
-commit 64b8759
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 9 22:16:15 2014 -0800
-
-    Try to fix dist.
+    To do:
+    - Fix curly quote in HHC title.
     
-    Change-Id: Ib4332bace88f9db7a06867861c40627e2bdc55f0
-    Reviewed-on: https://code.wireshark.org/review/5218
+    Change-Id: I9b154b7fbd02703656e2ab380199ec0a6db4e36d
+    Reviewed-on: https://code.wireshark.org/review/6379
     Reviewed-by: Gerald Combs <gerald@wireshark.org>
 
-commit cd5b402
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 9 21:28:00 2014 -0800
+commit 4b8c668
+Author: Guy Harris <guy@alum.mit.edu>
+Date:   Thu Jan 8 13:25:54 2015 -0800
 
-    Fix an include.
+    To register an SCTP port, register in "sctp.port", not "udp.port".
     
-    Change-Id: Ic46b24cac01c49be01c7ad9e8a12b276fcdf81a5
-    Reviewed-on: https://code.wireshark.org/review/5217
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I8f013b2895e42919ea0d97cdc35414ea3f5aec9b
+    Reviewed-on: https://code.wireshark.org/review/6422
+    Reviewed-by: Guy Harris <guy@alum.mit.edu>
 
-commit 6228930
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 9 18:13:57 2014 -0800
+commit d8773b1
+Author: Pascal Quantin <pascal.quantin@gmail.com>
+Date:   Thu Jan 8 21:08:13 2015 +0100
 
-    Finish converting the User's Guide to AsciiDoc.
+    MQ: fix crash at startup
     
-    As with the Developer's Guide, add user-guide-docinfo.xml, which lets us
-    carry over DocBook front matter. Remove the meta_info chapter. Most of
-    its contents are now in user-guide-docinfo.xml. Add a DocBook revision
-    history based on hints from the Git/SVN/CVS revision history.
+    the array given to qsort algorithm must be alterable
     
-    Remove the various makefile targets for converting AsciiDoc files to
-    DocBook chapters. Remove GPL_appendix.xml. We use the AsciiDoc version.
-    
-    Change-Id: I543fa2a92f2c735c5f00c97ec65cff2187e09e3a
-    Reviewed-on: https://code.wireshark.org/review/5216
-    Petri-Dish: Gerald Combs <gerald@wireshark.org>
-    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
-    Reviewed-by: Gerald Combs <gerald@wireshark.org>
+    Change-Id: I811cade161b7635e9bc9e070c1ec37d2cce50d1f
+    Reviewed-on: https://code.wireshark.org/review/6420
+    Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 
-commit 055e476
-Author: Michael Mann <mmann78@netscape.net>
-Date:   Sun Nov 9 14:00:01 2014 -0500
+commit c94192d
+Author: Martin Mathieson <martin.r.mathieson@googlemail.com>
+Date:   Thu Jan 8 16:08:06 2015 +0000
 
-    Add subdissector table for MPLS PW Associated Channel Type
+    Netflow: add (hidden) root filters for each vendor with supported 'pie' entries
     
-    Change-Id: Id72fcbe74b91b4eb25fb4d3f3d47a1d53c2857b2
-    Reviewed-on: https://code.wireshark.org/review/5212
-    Reviewed-by: Michael Mann <mmann78@netscape.net>
+    Change-Id: I2bdca4c092c247ab253d6ceb3770ac7ea935cdad
+    Reviewed-on: https://code.wireshark.org/review/6414
+    Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
 
-commit 3924310
-Author: Gerald Combs <gerald@zing.org>
-Date:   Sun Nov 9 11:39:15 2014 -0800
+commit 8bfd306
+Author: Michal Labedzki <michal.labedzki@tieto.com>
+Date:   Wed Dec 31 10:53:25 2014 +0100
 
-    WSUG: Convert ``Command Line Tools'' to AsciiDoc.
+    Bluetooth: Update to latest Assigned Numbers (up to 4.2)
     
-    Move the idl2wrs section to the Developer's Guide. Leave most of the
-    other content intact for now.
+    Also start decoding next two profile attribute groups in SDP
+    (MPS and CTN) and add new two fields in EIR/A