Merge branch 'develop' into roster

Browse Source

Conflicts:
	sleekxmpp/basexmpp.py

...

This commit is contained in:

Lance Stout 2011-06-15 10:57:25 -07:00

parent a3597d6deb 58aa944a5e

commit e4b3a191d6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available