# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1303155577 -3600
# Node ID 8ff9a03e208b798d87111295f20e65b76a9fdbb4
# Parent  0c525524f2dcaec7082d7d9df4bb5dc95ba881d7# Parent  2f1397b7b1d5b601d68236f44fcbdf286a6f7add
Merge 0.8->trunk

diff -r 0c525524f2dc -r 8ff9a03e208b .hgtags
--- a/.hgtags	Fri Apr 15 22:46:57 2011 +0100
+++ b/.hgtags	Mon Apr 18 20:39:37 2011 +0100
@@ -41,3 +41,4 @@
 ea80531e5cbc567c3e211d38749c45e8b66d33b7 0.7.0
 5ea90ee96022b9c106e7e79b4a1d8b2ee99d45dc 0.7.0
 49b9e73e31ef38ff1c0141a83f897b5837c40d83 0.8.0
+aa905291a66c7d8168b1cb912bb173e6478dac05 0.8.1