aboutsummaryrefslogtreecommitdiffstats
path: root/pull_from_master.sh
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2008-11-10 16:29:19 +0100
committerTobias Markmann <tm@ayena.de>2008-11-10 16:29:19 +0100
commit3bbc4e33918539c38c8266cffd0495c68fcbebf6 (patch)
treee7f84ad442da82e00b4b1ac874e85e01043bbe57 /pull_from_master.sh
parentc4d2deffc64a4d955e52d7e8b2dce3af444872c7 (diff)
parenteea12d2279cd8f1e41c9234430e961754be6ce76 (diff)
downloadprosody-3bbc4e33918539c38c8266cffd0495c68fcbebf6.tar.gz
prosody-3bbc4e33918539c38c8266cffd0495c68fcbebf6.zip
Merging.
Diffstat (limited to 'pull_from_master.sh')
0 files changed, 0 insertions, 0 deletions