about summary refs log tree commit diff stats
path: root/src/xmpp
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2013-08-19 14:37:08 +0100
committerJames Booth <boothj5@gmail.com>2013-08-19 14:37:08 +0100
commitc2c7be03ea3785cb9363b6f9b69998e67929013d (patch)
tree45bb7c85657c162617d09b4c5c8500d12421334c /src/xmpp
parent6ea17d8e01af4a1867f32d1a9d9166bf10ce8ba3 (diff)
parentef511438b63ed7227558033250cb12dc3b84f98e (diff)
downloadprofani-tty-c2c7be03ea3785cb9363b6f9b69998e67929013d.tar.gz
Merge branch 'master' into nextdev
Diffstat (limited to 'src/xmpp')
0 files changed, 0 insertions, 0 deletions