aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-02-19 15:18:44 +0000
committerMatthew Wild <mwild1@gmail.com>2009-02-19 15:18:44 +0000
commitec92f62650b73c4fe87f61f9e4b68246239fc017 (patch)
tree2e65cd4208e9a2e7a479bd2b9dc691a9e28e2b18 /core
parent3af91c3bf28a042b5ba08d085b3b4f1aefabb377 (diff)
parenta562843a9b1e0a8eb70b68d871eeca6268173828 (diff)
downloadprosody-ec92f62650b73c4fe87f61f9e4b68246239fc017.tar.gz
prosody-ec92f62650b73c4fe87f61f9e4b68246239fc017.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions