Ensure PEP updates default to item if of 'current'
Check delay field existence
Import missing class
Merge pull request #265 from anton-ryzhov/delay_plugins

Check delay field existence
Added a MUC method 'setRole'. Change role property of a nick in a room, useful for moderator bots.
Merge pull request #267 from juanrmn/develop

Added a MUC method 'setRole'. Change role property of a nick in a room, ...
Don't use dnspython for A and AAAA (but keep it for SRV).
dnspython don't perform a full resolv.
For example it don't manage /etc/hosts on linux.
Use strings for ElementTree.iterparse events names

Because if cElementTree is not available on the system,
ElementTree is used instead, and that version doesn't accept
bytes, resulting in an exception. See
http://bugs.python.org/issue9257#msg152864
Merge pull request #271 from louiz/develop

Use strings for ElementTree.iterparse events names
Undo event name fix, due to breakage in Py2.x
Allow setting custom cipher suites in Py2.7+
Merge pull request #270 from optiflows/fix_hosts

Don't use dnspython for A and AAAA (but keep it for SRV).
Merge branch 'develop' into new_muc

Conflicts:
	sleekxmpp/plugins/xep_0045.py
Don't blow up if a stanza doesn't have an id