summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-07 01:40:29 -0700
committerLance Stout <lancestout@gmail.com>2012-08-07 01:40:29 -0700
commit75d904ed01921eaa95ba3cd22c4740d77729913d (patch)
tree96d1126ddcac3fe3db82062f731b2abff4a27149 /tests
parentf81d5e4bd656fb64dd7f4285afa26e452a869a63 (diff)
parentaebcf6ff828bf179af95df38d7f8ffa54f289c36 (diff)
downloadslixmpp-75d904ed01921eaa95ba3cd22c4740d77729913d.tar.gz
slixmpp-75d904ed01921eaa95ba3cd22c4740d77729913d.tar.bz2
slixmpp-75d904ed01921eaa95ba3cd22c4740d77729913d.tar.xz
slixmpp-75d904ed01921eaa95ba3cd22c4740d77729913d.zip
Merge branch 'master' into develop
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions