summaryrefslogtreecommitdiff
path: root/docs/event_index.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-24 11:51:03 -0700
committerLance Stout <lancestout@gmail.com>2012-08-24 11:51:03 -0700
commit19a78f63f4a24d7a5ff568608d4323f773d785e2 (patch)
tree5cffabf943f3aeba1b5763a84e28caf0ed3ab1d8 /docs/event_index.rst
parente20610ab80b1edf3be84a2a5a0fafc22a35d3aee (diff)
parentc7ec6a72cda41c7dbbdd4193d795b5dd8df4843f (diff)
downloadslixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.tar.gz
slixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.tar.bz2
slixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.tar.xz
slixmpp-19a78f63f4a24d7a5ff568608d4323f773d785e2.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs/event_index.rst')
0 files changed, 0 insertions, 0 deletions