aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-09-29 01:05:17 +0200
committerKim Alvefur <zash@zash.se>2012-09-29 01:05:17 +0200
commit30cc53f69a9ea9730a66ee4aa056f98185d16d39 (patch)
treee38cb97ac0c650ba81c8cc04ab37819ff82ce49c
parent3b0a7cf1abec40afc5bbb208578f7115c0437c37 (diff)
parent2d99e89c20925e3fba0e3d86fccbcf2345270af4 (diff)
downloadprosody-30cc53f69a9ea9730a66ee4aa056f98185d16d39.tar.gz
prosody-30cc53f69a9ea9730a66ee4aa056f98185d16d39.zip
Merge 0.9 -> trunk (like this?)
0 files changed, 0 insertions, 0 deletions