Florian Schmaus d06d5b7c69 Merge branch '4.0' ... Conflicts: build.gradle		2014-07-20 14:19:59 +02:00
..
integration-test	Change IQ.Type to enum	2014-06-06 21:10:13 -03:00
main	Merge branch '4.0'	2014-07-20 14:19:59 +02:00
test	Remove Packet.ID_NOT_AVAILABLE	2014-07-06 23:57:06 +02:00