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

[Peter Lemenkov]

commit bf95e4f288c690256b99fd0e608ac84a0ee0b454
Merge: 54fb51d 527f19a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Sep 12 19:01:12 2013 +0400

    Merge branch 'master' into f20

 wireshark-mime-package.xml |    9 -------
 wireshark.desktop          |   15 ------------
 wireshark.spec             |   55 +++++++++++++++++--------------------------
 wiresharkdoc-16x16.png     |  Bin 655 -> 0 bytes
 wiresharkdoc-256x256.png   |  Bin 25329 -> 0 bytes
 wiresharkdoc-32x32.png     |  Bin 1860 -> 0 bytes
 wiresharkdoc-48x48.png     |  Bin 3036 -> 0 bytes
 7 files changed, 22 insertions(+), 57 deletions(-)
---