diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-02-13 15:34:33 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-02-13 15:34:33 +0000 |
| commit | 2cdf73b6c3d8253849b68c9293f7df8550dc466b (patch) | |
| tree | 7f4dc829e45a0c9c4e202a2006df9b47bc7f552a /core | |
| parent | 8d64ab2d1fd2d4f0e3150fcdfd037a9771a2e419 (diff) | |
| parent | 942fd3d9657357ee6c6a47570a54bea4754e585e (diff) | |
| download | prosody-2cdf73b6c3d8253849b68c9293f7df8550dc466b.tar.gz prosody-2cdf73b6c3d8253849b68c9293f7df8550dc466b.zip | |
Merge with backout
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions