aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-04-20 03:03:07 +0100
committerMatthew Wild <mwild1@gmail.com>2009-04-20 03:03:07 +0100
commitdabd9b0b5364630a603daecd3261d45999eff3c7 (patch)
treedc7e3765689e50d37e541743d7e88ba9f0144b0d /doc
parentf0a842ae4bcf5b7d09a08b65275e4b828838cfe5 (diff)
parentcface37b4928e922a43ef37d1bc49ab3a4009479 (diff)
downloadprosody-dabd9b0b5364630a603daecd3261d45999eff3c7.tar.gz
prosody-dabd9b0b5364630a603daecd3261d45999eff3c7.zip
Merging stable into unstable
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions