summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-11-17 14:33:09 -0500
committerLance Stout <lancestout@gmail.com>2010-11-17 14:33:09 -0500
commitdebf90935981622c7b23009b7edeb311fd57ee5c (patch)
tree6c2ba5c7c82a03830bcb1a1eb9352d1556009f9b /README
parent0d4d84b2fa3587c01db0764651105b3cc9cd00f9 (diff)
parentb8114b25ed28437248322aad50209f737faa392c (diff)
downloadslixmpp-debf90935981622c7b23009b7edeb311fd57ee5c.tar.gz
slixmpp-debf90935981622c7b23009b7edeb311fd57ee5c.tar.bz2
slixmpp-debf90935981622c7b23009b7edeb311fd57ee5c.tar.xz
slixmpp-debf90935981622c7b23009b7edeb311fd57ee5c.zip
Merge branch 'develop' into roster
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions