commit 1ef04d35963d968bcd19c2d83dc2396f34c63517 Merge: 6a59cd9 16ed22d Author: Peter Lemenkov <lemenkov at gmail.com> Date: Mon Dec 9 13:18:25 2013 +0400 Merge branch 'master' into f20 ...Lemenkov-via-https-bugs.wireshark.org-bug.patch | 4 ++-- wireshark.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) ---