Software / code / prosody
Changeset
3242:43f9478d8119
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 12 Jun 2010 02:47:53 +0100 |
| parents | 3240:9782a222e941 (current diff) 3241:fee11dbd5cf8 (diff) |
| children | 3243:dc7131d4e189 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sat Jun 12 02:39:18 2010 +0100 +++ b/.hgtags Sat Jun 12 02:47:53 2010 +0100 @@ -38,3 +38,5 @@ 81b4e738e4d321b78274132f63a9aec7007e64eb 0.6.1 0395f2f34bd55a01ec7276884fb9a4e0051b0e7a 0.6.2 ea80531e5cbc567c3e211d38749c45e8b66d33b7 0.7.0 +ea80531e5cbc567c3e211d38749c45e8b66d33b7 0.7.0 +5ea90ee96022b9c106e7e79b4a1d8b2ee99d45dc 0.7.0
