[wireshark/f20: 2/2] Merge branch 'master' into f20

[Peter Lemenkov]

commit b20d95b4197136e6a6fd01df785959d0d7151e94
Merge: 0dbf43d ab5f7ca
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Jan 13 16:43:39 2014 +0400

    Merge branch 'master' into f20

 ...Lemenkov-via-https-bugs.wireshark.org-bug.patch |   66 +++--
 wireshark-0022-Fix-IP-types.patch                  |  299 ++++++++++++++++++++
 wireshark-0023-Copy-over-r54544-from-trunk.patch   |   34 +++
 wireshark.spec                                     |   15 +-
 4 files changed, 386 insertions(+), 28 deletions(-)
---