# HG changeset patch # User Matti Hamalainen # Date 1303677307 -10800 # Node ID 993fd8eb4271eecca89c3544467fd3c44a4dc206 # Parent 380a12286e33fc8b86fcc2d839d197aff4df3587# Parent dcf78e2c458cb8f6a028c9b040aaaed12faa3c78 Automated merge with file:///hg/nnchat diff -r dcf78e2c458c -r 993fd8eb4271 .hgtags --- a/.hgtags Sun Apr 24 23:35:00 2011 +0300 +++ b/.hgtags Sun Apr 24 23:35:07 2011 +0300 @@ -1,2 +1,6 @@ cbb9db83ef18f37ddd0a1b25d3f6aa6096a0c29d dev-0_8_9 f92f0322cbf3ca835af16ccedb47ca2188ed311f dev-0_8_11 +f92f0322cbf3ca835af16ccedb47ca2188ed311f dev-0_8_11 +0000000000000000000000000000000000000000 dev-0_8_11 +0000000000000000000000000000000000000000 dev-0_8_11 +a997631876807281de3d8d6860eb722ba0ca14a9 dev-0_8_11