Software / code / prosody
Changeset
490:9087f39b4222
Another automatic merge, this gets annoying."
| author | Tobias Markmann <tm@ayena.de> |
|---|---|
| date | Sat, 29 Nov 2008 22:11:21 +0100 |
| parents | 488:328135f63ea3 (diff) 489:237cddb1a785 (current diff) |
| children | 491:25042b0d2626 495:abc4fd4d262a |
| files | |
| diffstat | 0 files changed, 0 insertions(+), 0 deletions(-) [+] |