Wireshark-commits: [Wireshark-commits] master-1.12 9d29286: Backport change 14501 to master-2.0

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 16 Apr 2016 06:39:57 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9d29286c1a2983528e8d5cdd8b10d129be18615c
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

9d29286 by Jaap Keuter (jaap.keuter@xxxxxxxxx):

    Backport change 14501 to master-2.0
    
    Change-Id: I7b1f242b2c70e912bc653fba515eeb7b1acb6a09
    Reviewed-on: https://code.wireshark.org/review/14922
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 58fe773b2e863d0575636e9ddf30ef0adb790775)
    Reviewed-on: https://code.wireshark.org/review/14937
    

Actions performed:

    from  46e0b96   [Automatic update for 2016-04-10]
    adds  9d29286   Backport change 14501 to master-2.0


Summary of changes:
 asn1/inap/inap.cnf            |    2 +-
 epan/dissectors/packet-inap.c |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)