# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1276184901 -3600
# Node ID c80d052569c852168218a4f41e70486296876c07
# Parent  69e920d7c96816949b55ea5cee5320b14d207449# Parent  90dc4afe7352ebef168e6229f1df6330894634f4
Merge 0.7->trunk

diff -r 69e920d7c968 -r c80d052569c8 .hgtags
--- a/.hgtags	Thu Jun 10 16:47:17 2010 +0100
+++ b/.hgtags	Thu Jun 10 16:48:21 2010 +0100
@@ -37,3 +37,4 @@
 1a99a3bf3ce6dbdfb362b7fd101d761fb3cc10af 0.6.0
 81b4e738e4d321b78274132f63a9aec7007e64eb 0.6.1
 0395f2f34bd55a01ec7276884fb9a4e0051b0e7a 0.6.2
+ea80531e5cbc567c3e211d38749c45e8b66d33b7 0.7.0