aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2008-11-30 15:18:45 +0100
committerTobias Markmann <tm@ayena.de>2008-11-30 15:18:45 +0100
commit81ff9d3a9fbaff5893deeacc854c25b61d3f6106 (patch)
tree6b5760567398d1082c79feada1df649a35d2b79d /util
parentae8f24b0bfbb78c5359e66df7d16a9c9f3fac793 (diff)
parent90aca9cd5cecd28a32461814938b88e0acb1c02a (diff)
downloadprosody-81ff9d3a9fbaff5893deeacc854c25b61d3f6106.tar.gz
prosody-81ff9d3a9fbaff5893deeacc854c25b61d3f6106.zip
Automated merge with h-h.
Diffstat (limited to 'util')
0 files changed, 0 insertions, 0 deletions