Wireshark-dev: [Wireshark-dev] Master-2.0 update

From: Gerald Combs <gerald@xxxxxxxxxxxxx>
Date: Mon, 5 Oct 2015 14:24:00 -0700
We now have a master-2.0 branch, created from gd52322e. Any commits after
that which should go into 2.0 must be cherry-picked.

The buildbot for the new branch is up and running at
https://buildbot.wireshark.org/wireshark-2.0/waterfall