diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-06-29 20:17:21 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-06-29 20:17:21 +0100 |
| commit | ac2c84b749ab005099d27195c587edd1be640649 (patch) | |
| tree | a990c181c9fd47e3e92d21bdc138ccaa778bf740 /prosody | |
| parent | 9e70620d2631fff90974f2c40f435b15d8e386b1 (diff) | |
| parent | 5a862cb1afc932a2a72b4f569024dd5aaddcc6b8 (diff) | |
| download | prosody-ac2c84b749ab005099d27195c587edd1be640649.tar.gz prosody-ac2c84b749ab005099d27195c587edd1be640649.zip | |
Merge 0.7->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions